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 01/67] 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 @@
       <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 02/67] [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 03/67] 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 04/67] 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 05/67] 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 06/67] 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 07/67] 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 08/67] 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 @@
   <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 09/67] [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 @@
 
     <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 10/67] [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 @@
     <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 11/67] 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 12/67] 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 13/67] 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 14/67] [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 @@
       <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 15/67] [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 16/67] [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 17/67] 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 18/67] [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 19/67] [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 20/67] 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 21/67] 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 @@ <h3 id=modloader>Module loaders</h3>
 
       <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 22/67] 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 23/67] 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 24/67] 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 25/67] [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 26/67] [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 @@
       <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 27/67] [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 28/67] [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 29/67] 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 30/67] [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 31/67] [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 32/67] [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 33/67] [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 34/67] [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 35/67] [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 36/67] [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 37/67] [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 38/67] 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 39/67] [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 40/67] 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.com/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
 <script src="https://rawgithub.com/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 41/67] [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 42/67] [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 43/67] [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 44/67] [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 45/67] [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 46/67] [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 47/67] [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 48/67] [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 49/67] [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 50/67] [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 51/67] [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 52/67] [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 53/67] 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 54/67] 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 55/67] 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 56/67] [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 57/67] [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 58/67] 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 59/67] 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 60/67] 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 61/67] [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 62/67] [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 63/67] [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 @@
       <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 @@
       <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 64/67] 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 65/67] 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 66/67] [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 67/67] 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 @@
       <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 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 @@
   </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",