From 8f52819bdc799ece0981d2b1308ce966ff060070 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:04:39 +0200
Subject: [PATCH 01/71] Bump version number post-4.7

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

diff --git a/bower.json b/bower.json
index 81352b6d70..2704354d73 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.7.0",
+  "version":"4.7.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index cdbb107dd5..051a2178ae 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.7.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.7.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4f8a23bde8..054548d9d4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7824,7 +7824,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.7.0";
+  CodeMirror.version = "4.7.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index e7d5bd962b..c306fa531b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.7.0",
+    "version":"4.7.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From e1289d85c1518478a845d50d1a4797b16c1240b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:51:30 +0200
Subject: [PATCH 02/71] Saturate logo a little

---
 doc/docs.css |   2 +-
 doc/logo.png | Bin 9709 -> 9310 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/docs.css b/doc/docs.css
index 7747895d9f..837ba69782 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -29,7 +29,7 @@ article > h2:first-child, section:first-child > h2 { margin-top: 0; }
   margin-right: 12px;
   margin-top: 0;
   margin-bottom: 2px;
-  color: #E30808;
+  color: #d30707;
   letter-spacing: .5px;
 }
 
diff --git a/doc/logo.png b/doc/logo.png
index bdfc75df7db0db8c5d9336dba3070a9c1618c950..9aabda1d709f565bb115fa083cc16b6d52db64cf 100644
GIT binary patch
literal 9310
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

literal 9709
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
SjscElK`F?nO4m!8Mf?vl%E>qY


From 9ca51f30dbcbf7b97e194514d87f76cf450368cf Mon Sep 17 00:00:00 2001
From: Randy Burden <randy_burden@hotmail.com>
Date: Tue, 21 Oct 2014 18:30:00 -0500
Subject: [PATCH 03/71] [overlay mode demo] Fixed bug which highlighted the
 rest of the line

If "{{" was found, the code would highlight the rest of the line
regardless if a matching "}}" or "}}}" was found.
---
 demo/mustache.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/mustache.html b/demo/mustache.html
index ecc68555ef..ae4e6a891b 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -46,9 +46,10 @@
       var ch;
       if (stream.match("{{")) {
         while ((ch = stream.next()) != null)
-          if (ch == "}" && stream.next() == "}") break;
-        stream.eat("}");
-        return "mustache";
+          if (ch == "}" && stream.next() == "}") {
+            stream.eat("}");
+            return "mustache";
+          }
       }
       while (stream.next() != null && !stream.match("{{", false)) {}
       return null;

From 08183e426e4a743b8dce274bc51a6aa584b6a4c0 Mon Sep 17 00:00:00 2001
From: Jeremy Parmenter <shabado9889@gmail.com>
Date: Sun, 19 Oct 2014 15:05:10 -0700
Subject: [PATCH 04/71] [gfm mode] Added strikethrough implementation

---
 lib/codemirror.css        |  1 +
 mode/gfm/gfm.js           |  3 ++-
 mode/gfm/index.html       | 10 ++++++++++
 mode/gfm/test.js          | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 mode/markdown/markdown.js | 39 ++++++++++++++++++++++++++++++++++---
 5 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 68c67b170a..af9e0f26e6 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -125,6 +125,7 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-header, .cm-strong {font-weight: bold;}
 .cm-em {font-style: italic;}
 .cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
 
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index eb0b7c193b..80a8e2c84d 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -109,7 +109,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var markdownConfig = {
     underscoresBreakWords: false,
     taskLists: true,
-    fencedCodeBlocks: true
+    fencedCodeBlocks: true,
+    strikethrough: true
   };
   for (var attr in modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index a35e56866c..60d108c1ca 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -41,6 +41,16 @@
 
 Underscores_are_allowed_between_words.
 
+## Strikethrough text
+
+GFM adds syntax to strikethrough text, which is missing from standard Markdown.
+
+~~Mistaken text.~~
+~~**works with other fomatting**~~
+
+~~spans across
+lines~~
+
 ## Fenced code blocks (and syntax highlighting)
 
 ```javascript
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index b9af5e894c..c2bc38fd57 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -22,6 +22,12 @@
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][property&formatting&formatting-task [x]]][variable-2  foo]");
 
+  FT("formatting_strikethrough",
+     "[strikethrough&formatting&formatting-strikethrough ~~][strikethrough foo][strikethrough&formatting&formatting-strikethrough ~~]");
+
+  FT("formatting_strikethrough",
+     "foo [strikethrough&formatting&formatting-strikethrough ~~][strikethrough bar][strikethrough&formatting&formatting-strikethrough ~~]");
+
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
 
@@ -161,4 +167,47 @@
      "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
      "Issue: [link #1]",
      "Link: [link http://www.example.com/]");
+
+  MT("strikethrough",
+     "[strikethrough ~~foo~~]");
+
+  MT("strikethroughWithStartingSpace",
+     "~~ foo~~");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo~~~]");
+
+  MT("strikethroughUnclosedStrayTildes",
+     "[strikethrough ~~foo ~~]");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo ~~ bar]");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo ~~ bar~~]hello");
+
+  MT("strikethroughOneLetter",
+     "[strikethrough ~~a~~]");
+
+  MT("strikethroughWrapped",
+     "[strikethrough ~~foo]",
+     "[strikethrough foo~~]");
+
+  MT("strikethroughParagraph",
+     "[strikethrough ~~foo]",
+     "",
+     "foo[strikethrough ~~bar]");
+
+  MT("strikethroughEm",
+     "[strikethrough ~~foo][em&strikethrough *bar*][strikethrough ~~]");
+
+  MT("strikethroughEm",
+     "[em *][em&strikethrough ~~foo~~][em *]");
+
+  MT("strikethroughStrong",
+     "[strikethrough ~~][strong&strikethrough **foo**][strikethrough ~~]");
+
+  MT("strikethroughStrong",
+     "[strong **][strong&strikethrough ~~foo~~][strong **]");
+
 })();
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3eb7747e60..48464645bb 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -75,6 +75,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
 
+  // Turn on strikethrough syntax
+  if (modeCfg.strikethrough === undefined)
+    modeCfg.strikethrough = false;
+
   var codeDepth = 0;
 
   var header   = 'header'
@@ -91,7 +95,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   linktext = 'link'
   ,   linkhref = 'string'
   ,   em       = 'em'
-  ,   strong   = 'strong';
+  ,   strong   = 'strong'
+  ,   strikethrough = 'strikethrough';
 
   var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
@@ -99,7 +104,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
   ,   atxHeaderRE = /^#+/
   ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(]+/;
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -121,6 +126,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.em = false;
     // Reset STRONG state
     state.strong = false;
+    // Reset strikethrough state
+    state.strikethrough = false;
     // Reset state.quote
     state.quote = 0;
     if (!htmlFound && state.f == htmlBlock) {
@@ -283,6 +290,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (state.strong) { styles.push(strong); }
     if (state.em) { styles.push(em); }
+    if (state.strikethrough) { styles.push(strikethrough); }
 
     if (state.linkText) { styles.push(linktext); }
 
@@ -511,6 +519,29 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (modeCfg.strikethrough) {
+      if (ch === '~' && stream.eatWhile(ch)) {
+        if (state.strikethrough) {// Remove strikethrough
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          var t = getType(state);
+          state.strikethrough = false;
+          return t;
+        } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
+          state.strikethrough = true;
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          return getType(state);
+        }
+      } else if (ch === ' ') {
+        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+          if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+            return getType(state);
+          } else { // Not surrounded by spaces, back up pointer
+            stream.backUp(2);
+          }
+        }
+      }
+    }
+
     if (ch === ' ') {
       if (stream.match(/ +$/, false)) {
         state.trailingSpace++;
@@ -659,7 +690,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         listDepth: 0,
         quote: 0,
         trailingSpace: 0,
-        trailingSpaceNewLine: false
+        trailingSpaceNewLine: false,
+        strikethrough: false
       };
     },
 
@@ -683,6 +715,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         linkTitle: s.linkTitle,
         em: s.em,
         strong: s.strong,
+        strikethrough: s.strikethrough,
         header: s.header,
         taskList: s.taskList,
         list: s.list,

From 7e9080a2f3fa37cd6da43aaeaba5c82e7361c140 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 Oct 2014 17:41:27 +0200
Subject: [PATCH 05/71] Don't re-highlight lines that were highlighted during
 drawing

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 054548d9d4..9d6902ba96 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5878,12 +5878,13 @@
     return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
   }
 
-  function getLineStyles(cm, line) {
+  function getLineStyles(cm, line, updateFrontier) {
     if (!line.styles || line.styles[0] != cm.state.modeGen) {
       var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
       line.styles = result.styles;
       if (result.classes) line.styleClasses = result.classes;
       else if (line.styleClasses) line.styleClasses = null;
+      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
     }
     return line.styles;
   }
@@ -5938,7 +5939,8 @@
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
       builder.map = [];
-      insertLineContent(line, builder, getLineStyles(cm, line));
+      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
       if (line.styleClasses) {
         if (line.styleClasses.bgClass)
           builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");

From fb8692435b3dda5c417fa1e9a1fd8efd49e9f0ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Oct 2014 09:59:13 +0200
Subject: [PATCH 06/71] [solarized theme] Remove tab background character

It doesn't belong in a theme.
---
 theme/solarized.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 36d5f79048..07ef406804 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -88,11 +88,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-decoration-style: dotted;
 }
 .cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-tab:before {
-  content: "➤";   /*visualize tab character*/
-  color: #586e75;
-  position:absolute;
-}
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
   color: #586e75;

From 7206ccce08a565905570e963e3a98b84e75f677b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 23 Oct 2014 21:26:23 -0400
Subject: [PATCH 07/71] [vim] Fix bug that vim mode could not be disabled

---
 keymap/vim.js | 85 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a0a01e06c6..e1ff9469b6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -226,51 +226,52 @@
   var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
   var mac = /Mac/.test(navigator.platform);
   var Vim = function() {
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      function lookupKey(e) {
-        var keyCode = e.keyCode;
-        if (modifierCodes.indexOf(keyCode) != -1) { return; }
-        var hasModifier = e.ctrlKey || e.metaKey;
-        var key = CodeMirror.keyNames[keyCode];
-        key = specialKey[key] || key;
-        var name = '';
-        if (e.ctrlKey) { name += 'C-'; }
-        if (e.altKey) { name += 'A-'; }
-        if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
-          // Shift key bindings can only specified for special characters.
-          return;
-        } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
-          name += 'S-';
-        }
-        if (key.length == 1) { key = key.toLowerCase(); }
-        name += key;
-        if (name.length > 1) { name = '<' + name + '>'; }
-        return name;
+    function lookupKey(e) {
+      var keyCode = e.keyCode;
+      if (modifierCodes.indexOf(keyCode) != -1) { return; }
+      var hasModifier = e.ctrlKey || e.metaKey;
+      var key = CodeMirror.keyNames[keyCode];
+      key = specialKey[key] || key;
+      var name = '';
+      if (e.ctrlKey) { name += 'C-'; }
+      if (e.altKey) { name += 'A-'; }
+      if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
+        // Shift key bindings can only specified for special characters.
+        return;
+      } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
+        name += 'S-';
       }
-      // Keys with modifiers are handled using keydown due to limitations of
-      // keypress event.
-      function handleKeyDown(cm, e) {
-        var name = lookupKey(e);
-        if (!name) { return; }
-
-        CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-          CodeMirror.e_stop(e);
-        }
+      if (key.length == 1) { key = key.toLowerCase(); }
+      name += key;
+      if (name.length > 1) { name = '<' + name + '>'; }
+      return name;
+    }
+    // Keys with modifiers are handled using keydown due to limitations of
+    // keypress event.
+    function handleKeyDown(cm, e) {
+      var name = lookupKey(e);
+      if (!name) { return; }
+
+      CodeMirror.signal(cm, 'vim-keypress', name);
+      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+        CodeMirror.e_stop(e);
       }
-      // Keys without modifiers are handled using keypress to work best with
-      // non-standard keyboard layouts.
-      function handleKeyPress(cm, e) {
-        var code = e.charCode || e.keyCode;
-        if (e.ctrlKey || e.metaKey || e.altKey ||
-            e.shiftKey && code < 32) { return; }
-        var name = String.fromCharCode(code);
-
-        CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-          CodeMirror.e_stop(e);
-        }
+    }
+    // Keys without modifiers are handled using keypress to work best with
+    // non-standard keyboard layouts.
+    function handleKeyPress(cm, e) {
+      var code = e.charCode || e.keyCode;
+      if (e.ctrlKey || e.metaKey || e.altKey ||
+          e.shiftKey && code < 32) { return; }
+      var name = String.fromCharCode(code);
+
+      CodeMirror.signal(cm, 'vim-keypress', name);
+      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+        CodeMirror.e_stop(e);
       }
+    }
+
+    CodeMirror.defineOption('vimMode', false, function(cm, val) {
       if (val) {
         cm.setOption('keyMap', 'vim');
         cm.setOption('disableInput', true);

From b216b2ae780b87028c7cce3e3425182cbc0e9e4c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 16 Oct 2014 09:32:54 +0400
Subject: [PATCH 08/71] [vim] simplify selectBlock function

---
 keymap/vim.js    | 142 ++++++++++++++-----------------------------------------
 test/vim_test.js |  11 ++++-
 2 files changed, 46 insertions(+), 107 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e1ff9469b6..ee682e3cf0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2669,121 +2669,51 @@
     // Distance between selectionEnd.ch and any(first considered here) selection.ch
     function selectBlock(cm, selectionEnd) {
       var selections = [], ranges = cm.listSelections();
-      var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
-      var start, end, direction, selectionStart;
-      var curEnd = cm.getCursor('head');
-      var originalSelectionEnd = copyCursor(selectionEnd);
-      start = firstRange.line;
-      end = lastRange.line;
-      if (selectionEnd.line < curEnd.line) {
-        direction = 'up';
-      } else if (selectionEnd.line > curEnd.line) {
-        direction = 'down';
-      } else {
-        if (selectionEnd.ch != curEnd.ch) {
-          direction = selectionEnd.ch > curEnd.ch ? 'right' : 'left';
-        }
-        selectionStart = cm.getCursor('anchor');
-      }
-      var primIndex = getIndex(ranges, curEnd);
-      // sets to true when selectionEnd already lies inside the existing selections
-      selectionEnd = cm.clipPos(selectionEnd);
-      var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
-      var isClipped = !cursorEqual(originalSelectionEnd, selectionEnd);
-      // This function helps to check selection crossing
-      // in case of short lines.
-      var processSelectionCrossing = function() {
-        if (isClipped) {
-          if (curEnd.ch >= selectionStart.ch) {
-            selectionStart.ch++;
-          }
-        } else if (curEnd.ch == lineLength(cm, curEnd.line)) {
-          if (cursorEqual(ranges[primIndex].anchor, ranges[primIndex].head) && ranges.length>1) {
-            if (direction == 'up') {
-              if (contains || primIndex>0) {
-              start = firstRange.line;
-              end = selectionEnd.line;
-              selectionStart = ranges[primIndex-1].anchor;
-            }
-          } else {
-              if (contains || primIndex == 0) {
-                end = lastRange.line;
-                start = selectionEnd.line;
-                selectionStart = ranges[primIndex+1].anchor;
-              }
-            }
-            if (selectionEnd.ch >= selectionStart.ch) {
-              selectionStart.ch--;
-            }
-          }
-        }
-      };
-      switch(direction) {
-        case 'up':
-          start = contains ? firstRange.line : selectionEnd.line;
-          end = contains ? selectionEnd.line : lastRange.line;
-          selectionStart = lastRange;
-          processSelectionCrossing();
-          break;
-        case 'down':
-          start = contains ? selectionEnd.line : firstRange.line;
-          end = contains ? lastRange.line : selectionEnd.line;
-          selectionStart = firstRange;
-          processSelectionCrossing();
-          break;
-        case 'left':
-          if ((selectionEnd.ch <= selectionStart.ch) && (curEnd.ch > selectionStart.ch)) {
-            selectionStart.ch++;
-            selectionEnd.ch--;
-          }
-          break;
-        case 'right':
-          if ((selectionStart.ch <= selectionEnd.ch) && (curEnd.ch < selectionStart.ch)) {
-            selectionStart.ch--;
-            selectionEnd.ch++;
-          }
-          break;
-        default:
-          start = selectionStart.line;
-          end = selectionEnd.line;
-      }
-      while (start <= end) {
-        var anchor = {line: start, ch: selectionStart.ch};
-        var head = {line: start, ch: selectionEnd.ch};
-        var range = {anchor: anchor, head: head};
+      var head = copyCursor(cm.clipPos(selectionEnd));
+      var isClipped = !cursorEqual(selectionEnd, head);
+      var curHead = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curHead);
+      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
+      var max = ranges.length - 1;
+      var index = max - primIndex > primIndex ? max : 0;
+      var base = ranges[index].anchor;
+
+      var firstLine = Math.min(base.line, head.line);
+      var lastLine = Math.max(base.line, head.line);
+      var baseCh = base.ch, headCh = head.ch;
+
+      var dir = ranges[index].head.ch - baseCh;
+      var newDir = headCh - baseCh;
+      if (dir > 0 && newDir <= 0) {
+        baseCh++;
+        if (!isClipped) { headCh--; }
+      } else if (dir < 0 && newDir >= 0) {
+        baseCh--;
+        if (!wasClipped) { headCh++; }
+      } else if (dir < 0 && newDir == -1) {
+        baseCh--;
+        headCh++;
+      }
+      for (var line = firstLine; line <= lastLine; line++) {
+        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
-        if (cursorEqual(head, selectionEnd)) {
-            primIndex = selections.indexOf(range);
-        }
-        start++;
-      }
-      // Update selectionEnd and selectionStart
-      // after selection crossing
-      selectionEnd.ch = selections[0].head.ch;
-      selectionStart.ch = selections[0].anchor.ch;
-      if (cursorEqual(selectionEnd, selections[0].head)) {
-        selectionStart.line = selections[selections.length-1].anchor.line;
-      } else {
-        selectionStart.line = selections[0].anchor.line;
       }
+      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections, primIndex);
-      return selectionStart;
+      selectionEnd.ch = headCh;
+      base.ch = baseCh;
+      return base;
     }
     // getIndex returns the index of the cursor in the selections.
     function getIndex(ranges, cursor, end) {
-      var pos = -1;
       for (var i = 0; i < ranges.length; i++) {
-        var atAnchor = cursorEqual(ranges[i].anchor, cursor);
-        var atHead = cursorEqual(ranges[i].head, cursor);
-        if (end == 'head') {
-        pos = atHead ? i : pos;
-        } else if (end == 'anchor') {
-          pos = atAnchor ? i : pos;
-        } else {
-          pos = (atAnchor || atHead) ? i : pos;
+        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
+        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
+        if (atAnchor || atHead) {
+          return i;
         }
       }
-      return pos;
+      return -1;
     }
     function getSelectedAreaRange(cm, vim) {
       var lastSelection = vim.lastSelection;
diff --git a/test/vim_test.js b/test/vim_test.js
index 401172b649..5a2912bef4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1757,11 +1757,20 @@ testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
   helpers.doKeys('3', 'k');
   selections = cm.getSelections().join();
   eq('4', selections);
-}, {value: '123456\n78\nabcdefg\nfoobar'});
+  helpers.doKeys('5', 'j', 'k');
+  selections = cm.getSelections().join("");
+  eq(10, selections.length);
+}, {value: '123456\n78\nabcdefg\nfoobar\n}\n'});
 testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', '3' , 'l', '<Esc>');
   eqPos(makeCursor(0, 3), cm.getCursor());
+  helpers.doKeys('h', '<C-v>', '2' , 'j' ,'3' , 'l');
+  eq(cm.getSelections().join(), "3456,,cdef");
+  helpers.doKeys('4' , 'h');
+  eq(cm.getSelections().join(), "23,8,bc");
+  helpers.doKeys('2' , 'l');
+  eq(cm.getSelections().join(), "34,,cd");
 }, {value: '123456\n78\nabcdefg\nfoobar'});
 
 testVim('visual_marks', function(cm, vim, helpers) {

From 56dc38e94072122d5bdc86940eec8b7b8e04f076 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 24 Oct 2014 21:10:48 +0200
Subject: [PATCH 09/71] Link to new discussion forum

---
 CONTRIBUTING.md | 4 ++--
 index.html      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47006a17f4..c4296ce4d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@
 ## Getting help
 
 Community discussion, questions, and informal bug reporting is done on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror).
+[discuss.CodeMirror forum](http://discuss.codemirror.net).
 
 ## Submitting bug reports
 
@@ -17,7 +17,7 @@ reporting a bug, read these pointers.
 
 **Note:** The issue tracker is for *bugs*, not requests for help. Questions
 should be asked on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror) instead.
+[discuss.CodeMirror forum](http://discuss.codemirror.net) instead.
 
 ### Reporting bugs effectively
 
diff --git a/index.html b/index.html
index 0a9f1338fd..8dcd378332 100644
--- a/index.html
+++ b/index.html
@@ -165,7 +165,7 @@
   license that CodeMirror uses.</p>
 
   <p>Discussion around the project is done on
-  a <a href="http://groups.google.com/group/codemirror">mailing list</a>.
+  a <a href="http://discuss.codemirror.net">discussion forum</a>.
   There is also
   the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
   list, which is only used for major announcements (such as new

From eac6c9b34aab86cc10a10b2cd4377dd5f5431ffd Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 22 Oct 2014 21:40:55 +0400
Subject: [PATCH 10/71] [vim] improve handling of external selections

---
 keymap/vim.js    | 31 ++++++++++++++++++-------------
 test/vim_test.js |  3 ++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ee682e3cf0..c58de9d44d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -706,8 +706,11 @@
           return true;
         }
 
-        if (vim.insertMode) { return handleKeyInsertMode(); }
-        else { return handleKeyNonInsertMode(); }
+        return cm.operation(function() {
+          cm.curOp.isVimOp = true;
+          if (vim.insertMode) { return handleKeyInsertMode(); }
+          else { return handleKeyNonInsertMode(); }
+        });
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -2100,7 +2103,6 @@
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
-          cm.on('mousedown', exitVisualMode);
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
@@ -2820,7 +2822,6 @@
     }
 
     function exitVisualMode(cm) {
-      cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
@@ -4655,9 +4656,7 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else if (cm.doc.history.lastSelOrigin == '*mouse') {
-        // Reset lastHPos if mouse click was done in normal mode.
-        vim.lastHPos = cm.doc.getCursor().ch;
+      } else {
         handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
@@ -4680,16 +4679,22 @@
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
       var head = cm.getCursor('head');
-      // Enter visual mode when the mouse selects text.
-      if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+      // Enter or exit visual mode to match mouse selection.
+      if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
+        exitVisualMode(cm);
+      } else if (!cm.curOp.isVimOp && !vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
         vim.visualMode = true;
         vim.visualLine = false;
         CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-        cm.on('mousedown', exitVisualMode);
       }
-      if (vim.visualMode) {
-        updateMark(cm, vim, '<', cursorMin(head, anchor));
-        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      if (!cm.curOp.isVimOp) {
+        if (vim.visualMode) {
+          updateMark(cm, vim, '<', cursorMin(head, anchor));
+          updateMark(cm, vim, '>', cursorMax(head, anchor));
+        } else if (!vim.insertMode) {
+          // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+          vim.lastHPos = cm.getCursor().ch;
+        }
       }
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 5a2912bef4..a88d02725e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1736,7 +1736,7 @@ testVim('visual_block', function(cm, vim, helpers) {
   // switch between visual modes
   cm.setCursor(1, 1);
   // blockwise to characterwise visual
-  helpers.doKeys('<C-v>', '<C-v>', 'j', 'l', 'v');
+  helpers.doKeys('<C-v>', 'j', 'l', 'v');
   selections = cm.getSelections();
   eq('7891\nabc', selections.join(''));
   // characterwise to blockwise
@@ -1785,6 +1785,7 @@ testVim('visual_marks', function(cm, vim, helpers) {
 testVim('visual_join', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
   eq(' 1 2 3\n 4\n 5', cm.getValue());
+  is(!vim.visualMode);
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
 testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');

From 5a78462df6b4f70664fd6a6df0933c527cf2df3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 10:30:12 +0100
Subject: [PATCH 11/71] [real-world uses] Add three links

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 362408f72b..e9b6d45cce 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -121,6 +121,7 @@
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
+      <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>
@@ -133,6 +134,7 @@
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>
+      <li><a href="http://snaptomato.appspot.com/editor.html">Snap Tomato</a> (HTML editing/testing page)</li>
       <li><a href="http://snippets.pro/">Snippets.pro</a> (code snippet sharing)</li>
       <li><a href="http://www.solidshops.com/">SolidShops</a> (hosted e-commerce platform)</li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
@@ -153,6 +155,7 @@
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
+      <li><a href="https://github.com/b3log/wide">Wide</a> (golang web IDE)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
       <li><a href="https://www.writelatex.com">writeLaTeX</a> (Collaborative LaTeX Editor)</li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>

From 514b5bfc007a4339d86300ee271ab662ed0599a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 11:50:13 +0100
Subject: [PATCH 12/71] Allow calling the constructor with null as place

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9d6902ba96..6bfbbf5cda 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -184,8 +184,10 @@
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
     if (ie && ie_version < 8) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
 
-    if (place.appendChild) place.appendChild(d.wrapper);
-    else place(d.wrapper);
+    if (place) {
+      if (place.appendChild) place.appendChild(d.wrapper);
+      else place(d.wrapper);
+    }
 
     // Current rendered range (may be bigger than the view window).
     d.viewFrom = d.viewTo = doc.first;

From 4902d070c9ba400d2b312733861c32a51ec8cfd1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 14:12:00 +0100
Subject: [PATCH 13/71] [vim mode] Don't directly access .options

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

diff --git a/keymap/vim.js b/keymap/vim.js
index c58de9d44d..832710ca0c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2271,11 +2271,12 @@
           return;
         }
         if (actionArgs.matchIndent) {
-          // length that considers tabs and cm.options.tabSize
+          var tabSize = cm.getOption("tabSize");
+          // length that considers tabs and tabSize
           var whitespaceLength = function(str) {
             var tabs = (str.split("\t").length - 1);
             var spaces = (str.split(" ").length - 1);
-            return tabs * cm.options.tabSize + spaces * 1;
+            return tabs * tabSize + spaces * 1;
           };
           var currentLine = cm.getLine(cm.getCursor().line);
           var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
@@ -2288,8 +2289,8 @@
             if (newIndent < 0) {
               return "";
             }
-            else if (cm.options.indentWithTabs) {
-              var quotient = Math.floor(newIndent / cm.options.tabSize);
+            else if (cm.getOption("indentWithTabs")) {
+              var quotient = Math.floor(newIndent / tabSize);
               return Array(quotient + 1).join('\t');
             }
             else {
@@ -2451,7 +2452,7 @@
           replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
           if (vim.visualBlock) {
             // Tabs are split in visua block before replacing
-            var spaces = new Array(cm.options.tabSize+1).join(' ');
+            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
             replaceWithStr = cm.getSelection();
             replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
             cm.replaceSelections(replaceWithStr);

From f2459b2867e982a30e56ea32925f674e693072b8 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 27 Oct 2014 22:04:51 +0400
Subject: [PATCH 14/71] [vim] implement gu and gU

---
 keymap/vim.js    | 49 ++++++++++++++++++-------------------------------
 test/vim_test.js | 26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 832710ca0c..0d6007246d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -156,7 +156,9 @@
     { keys: 'c', type: 'operator', operator: 'change' },
     { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
     { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
-    { keys: 'g~', type: 'operator', operator: 'swapcase' },
+    { keys: 'g~', type: 'operator', operator: 'changeCase' },
+    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
+    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
     { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
     { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
@@ -165,7 +167,7 @@
     { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: '~', type: 'operatorMotion', operator: 'swapcase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
@@ -192,8 +194,8 @@
     // Handle Replace-mode as a special case of insert mode.
     { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
     { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
-    { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
     { keys: '<C-r>', type: 'action', action: 'redo' },
     { keys: 'm<character>', type: 'action', action: 'setMark' },
     { keys: '"<character>', type: 'action', action: 'setRegister' },
@@ -1915,17 +1917,24 @@
         cm.setCursor(curStart);
         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
       },
-      swapcase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
+      changeCase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
         var selections = cm.getSelections();
         var ranges = cm.listSelections();
         var swapped = [];
+        var toLower = operatorArgs.toLower;
         for (var j = 0; j < selections.length; j++) {
           var toSwap = selections[j];
           var text = '';
-          for (var i = 0; i < toSwap.length; i++) {
-            var character = toSwap.charAt(i);
-            text += isUpperCase(character) ? character.toLowerCase() :
-                character.toUpperCase();
+          if (toLower === true) {
+            text = toSwap.toLowerCase();
+          } else if (toLower === false) {
+            text = toSwap.toUpperCase();
+          } else {
+            for (var i = 0; i < toSwap.length; i++) {
+              var character = toSwap.charAt(i);
+              text += isUpperCase(character) ? character.toLowerCase() :
+                  character.toUpperCase();
+            }
           }
           swapped.push(text);
         }
@@ -2508,28 +2517,6 @@
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
-      changeCase: function(cm, actionArgs, vim) {
-        var selectionStart = getSelectedAreaRange(cm, vim)[0];
-        var text = cm.getSelection();
-        var lastSelectionCurEnd;
-        var blockSelection;
-        if (vim.lastSelection) {
-        // save the curEnd marker to avoid its removal due to cm.replaceRange
-          lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
-          blockSelection = vim.lastSelection.visualBlock;
-        }
-        var toLower = actionArgs.toLower;
-        text = toLower ? text.toLowerCase() : text.toUpperCase();
-        cm.replaceSelections(vim.visualBlock || blockSelection ? text.split('\n') : [text]);
-        // restore the last selection curEnd marker
-        if (lastSelectionCurEnd) {
-          vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
-        }
-        cm.setCursor(selectionStart);
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-      },
       exitInsertMode: exitInsertMode
     };
 
diff --git a/test/vim_test.js b/test/vim_test.js
index a88d02725e..12cafa1193 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -957,6 +957,32 @@ testVim('g~g~', function(cm, vim, helpers) {
   is(!register.linewise);
   eqPos({line: curStart.line, ch:0}, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
+testVim('gu_and_gU', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 7);
+  var value = cm.getValue();
+  cm.setCursor(curStart);
+  helpers.doKeys('2', 'g', 'U', 'w');
+  eq(cm.getValue(), 'wa wb xX WC wd');
+  eqPos(curStart, cm.getCursor());
+  helpers.doKeys('2', 'g', 'u', 'w');
+  eq(cm.getValue(), value);
+
+  helpers.doKeys('2', 'g', 'U', 'B');
+  eq(cm.getValue(), 'wa WB Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  cm.setCursor(makeCursor(0, 4));
+  helpers.doKeys('g', 'u', 'i', 'w');
+  eq(cm.getValue(), 'wa wb Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  // TODO: support gUgU guu
+  // eqPos(makeCursor(0, 0), cm.getCursor());
+
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+}, { value: 'wa wb xx wc wd' });
 testVim('visual_block_~', function(cm, vim, helpers) {
   cm.setCursor(1, 1);
   helpers.doKeys('<C-v>', 'l', 'l', 'j', '~');

From f1870d8e72fbcdfdd8c079461488c5e3d3bff3b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 12:11:10 +0100
Subject: [PATCH 15/71] Support attach and detach methods for key maps

And adjust vim mode to use these.
---
 demo/vim.html      |  2 +-
 keymap/vim.js      | 81 ++++++++++++++++++++++++++++++++++++------------------
 lib/codemirror.css |  4 +--
 lib/codemirror.js  | 24 +++++++++-------
 4 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index d637c5c869..6a33a6c075 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -80,7 +80,7 @@
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         mode: "text/x-csrc",
-        vimMode: true,
+        keyMap: "vim",
         matchBrackets: true,
         showCursorWhenSelecting: true
       });
diff --git a/keymap/vim.js b/keymap/vim.js
index 0d6007246d..14affb1ae9 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -273,26 +273,48 @@
       }
     }
 
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      if (val) {
-        cm.setOption('keyMap', 'vim');
-        cm.setOption('disableInput', true);
-        cm.setOption('showCursorWhenSelecting', false);
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-        cm.on('cursorActivity', onCursorActivity);
-        maybeInitVimState(cm);
-        CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-        cm.on('keypress', handleKeyPress);
-        cm.on('keydown', handleKeyDown);
-      } else if (cm.state.vim) {
-        cm.setOption('keyMap', 'default');
-        cm.setOption('disableInput', false);
-        cm.off('cursorActivity', onCursorActivity);
-        CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
-        cm.state.vim = null;
-        cm.off('keypress', handleKeyPress);
-        cm.off('keydown', handleKeyDown);
-      }
+    function enterVimMode(cm) {
+      cm.setOption('disableInput', true);
+      cm.setOption('showCursorWhenSelecting', false);
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      cm.on('cursorActivity', onCursorActivity);
+      maybeInitVimState(cm);
+      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.on('keypress', handleKeyPress);
+      cm.on('keydown', handleKeyDown);
+      CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+    }
+
+    function leaveVimMode(cm) {
+      cm.setOption('disableInput', false);
+      cm.off('cursorActivity', onCursorActivity);
+      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.state.vim = null;
+      cm.off('keypress', handleKeyPress);
+      cm.off('keydown', handleKeyDown);
+    }
+
+    function detachVimMap(cm, next) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!next || next.attach != attachVimMap)
+        leaveVimMode(cm, false);
+    }
+    function attachVimMap(cm, prev) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!prev || prev.attach != attachVimMap)
+        enterVimMode(cm);
+    }
+
+    // Deprecated, simply setting the keymap works again.
+    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
+      if (val && cm.getOption("keyMap") != "vim")
+        cm.setOption("keyMap", "vim");
+      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
+        cm.setOption("keyMap", "default");
     });
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
@@ -4468,9 +4490,10 @@
     }
 
     CodeMirror.keyMap.vim = {
-        'nofallthrough': true,
-        'style': 'fat-cursor'
-      };
+      nofallthrough: true,
+      attach: attachVimMap,
+      detach: detachVimMap
+    };
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
@@ -4540,16 +4563,22 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
-      fallthrough: ['default']
+      fallthrough: ['default'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     CodeMirror.keyMap['await-second'] = {
-      fallthrough: ['vim-insert']
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     CodeMirror.keyMap['vim-replace'] = {
       'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert']
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     function executeMacroRegister(cm, vim, macroModeState, registerName) {
diff --git a/lib/codemirror.css b/lib/codemirror.css
index af9e0f26e6..074dd41b12 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -52,12 +52,12 @@
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6bfbbf5cda..4ec22f66de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -303,10 +303,13 @@
     });
   }
 
-  function keyMapChanged(cm) {
-    var map = keyMap[cm.options.keyMap], style = map.style;
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
-      (style ? " cm-keymap-" + style : "");
+  function keyMapChanged(cm, old) {
+    if (old == cm.options.keyMap) return;
+
+    old = (old == CodeMirror.Init) ? null : getKeyMap(old);
+    var map = getKeyMap(cm.options.keyMap);
+    if (old && old.detach) old.detach(cm, map);
+    if (map.attach) map.attach(cm, old);
   }
 
   function themeChanged(cm) {
@@ -3185,8 +3188,9 @@
     clearTimeout(maybeTransition);
     if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
       if (getKeyMap(cm.options.keyMap) == startMap) {
+        var old = cm.options.keyMap;
         cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm);
+        keyMapChanged(cm, old);
       }
     }, 50);
 
@@ -4504,7 +4508,7 @@
     themeChanged(cm);
     guttersChanged(cm);
   }, true);
-  option("keyMap", "default", keyMapChanged);
+  option("keyMap", "default", function(cm, val, old) { keyMapChanged(cm, old); });
   option("extraKeys", null);
 
   option("lineWrapping", false, wrappingChanged, true);
@@ -7375,13 +7379,13 @@
   };
 
   function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
-  function rmClass(node, cls) {
+  var rmClass = CodeMirror.rmClass = function(node, cls) {
     var test = classTest(cls);
     if (test.test(node.className)) node.className = node.className.replace(test, "");
-  }
-  function addClass(node, cls) {
+  };
+  var addClass = CodeMirror.addClass = function(node, cls) {
     if (!classTest(cls).test(node.className)) node.className += " " + cls;
-  }
+  };
   function joinClasses(a, b) {
     var as = a.split(" ");
     for (var i = 0; i < as.length; i++)

From b077d68ae1a731f0685f615db1664f3507751079 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 16:22:18 +0100
Subject: [PATCH 16/71] Allow non-normalized keys and multi-stroke keys in
 keymaps

As long as CodeMirror.normalizeKeyMap is called on them before they are
used. This interface is a little weird, but backwards-compatible.
---
 demo/sublime.html |  11 +--
 keymap/emacs.js   |  47 +++++------
 keymap/sublime.js |  29 ++++---
 keymap/vim.js     |   5 +-
 lib/codemirror.js | 239 ++++++++++++++++++++++++++++++++----------------------
 test/vim_test.js  |   4 +-
 6 files changed, 182 insertions(+), 153 deletions(-)

diff --git a/demo/sublime.html b/demo/sublime.html
index 4cedbcd623..b3b5342c97 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -53,14 +53,11 @@
 
 <script>
   var value = "// The bindings defined specifically in the Sublime Text mode\nvar bindings = {\n";
-  var map = CodeMirror.keyMap.sublime, mapK = CodeMirror.keyMap["sublime-Ctrl-K"];
+  var map = CodeMirror.keyMap.sublime;
   for (var key in map) {
-    if (key != "Ctrl-K" && key != "fallthrough" && (!/find/.test(map[key]) || /findUnder/.test(map[key])))
-      value += "  \"" + key + "\": \"" + map[key] + "\",\n";
-  }
-  for (var key in mapK) {
-    if (key != "auto" && key != "nofallthrough")
-      value += "  \"Ctrl-K " + key + "\": \"" + mapK[key] + "\",\n";
+    var val = map[key];
+    if (key != "fallthrough" && val != "..." && (!/find/.test(val) || /findUnder/.test(val)))
+      value += "  \"" + key + "\": \"" + val + "\",\n";
   }
   value += "}\n\n// The implementation of joinLines\n";
   value += CodeMirror.commands.joinLines.toString().replace(/^function\s*\(/, "function joinLines(").replace(/\n  /g, "\n") + "\n";
diff --git a/keymap/emacs.js b/keymap/emacs.js
index ba8149c70e..4acfd601a0 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -256,7 +256,7 @@
 
   // Actual keymap
 
-  var keyMap = CodeMirror.keyMap.emacs = {
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
     "Ctrl-K": repeated(function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
@@ -353,27 +353,7 @@
     "Alt-/": "autocomplete",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
 
-    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
-    "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
-    "Ctrl-U": addPrefixMap
-  };
-
-  CodeMirror.keyMap["emacs-Ctrl-X"] = {
-    "Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
-
-    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
-    "Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
-
-  CodeMirror.keyMap["emacs-Alt-G"] = {
-    "G": function(cm) {
+    "Alt-G G": function(cm) {
       var prefix = getPrefix(cm, true);
       if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
 
@@ -383,13 +363,24 @@
           cm.setCursor(num - 1);
       });
     },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
 
-  CodeMirror.keyMap["emacs-Ctrl-Q"] = {
-    "Tab": repeated("insertTab"),
-    auto: "emacs", nofallthrough: true
-  };
+    "Ctrl-X Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+    "Ctrl-X Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
+    "Ctrl-X Ctrl-S": "save",
+    "Ctrl-X Ctrl-W": "save",
+    "Ctrl-X S": "saveAll",
+    "Ctrl-X F": "open",
+    "Ctrl-X U": repeated("undo"),
+    "Ctrl-X K": "close",
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+
+    "Ctrl-Q Tab": repeated("insertTab"),
+    "Ctrl-U": addPrefixMap
+  });
 
   var prefixMap = {"Ctrl-G": clearPrefix};
   function regPrefix(d) {
diff --git a/keymap/sublime.js b/keymap/sublime.js
index f70a1f98f2..45936c3628 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -386,9 +386,7 @@
 
   map["Alt-Q"] = "wrapLines";
 
-  var mapK = CodeMirror.keyMap["sublime-Ctrl-K"] = {auto: "sublime", nofallthrough: true};
-
-  map[ctrl + "K"] = function(cm) {cm.setOption("keyMap", "sublime-Ctrl-K");};
+  var cK = ctrl + "K ";
 
   function modifyWordOrSelection(cm, mod) {
     cm.operation(function() {
@@ -409,9 +407,9 @@
     });
   }
 
-  mapK[ctrl + "Backspace"] = "delLineLeft";
+  map[cK + ctrl + "Backspace"] = "delLineLeft";
 
-  cmds[mapK[ctrl + "K"] = "delLineRight"] = function(cm) {
+  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = ranges.length - 1; i >= 0; i--)
@@ -420,22 +418,22 @@
     });
   };
 
-  cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
   };
-  cmds[mapK[ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
   };
 
-  cmds[mapK[ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
     if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
     cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
   };
-  cmds[mapK[ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) cm.setSelection(cm.getCursor(), found);
   };
-  cmds[mapK[ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       var from = cm.getCursor(), to = found;
@@ -444,7 +442,7 @@
       cm.replaceRange("", from, to);
     }
   };
-  cmds[mapK[ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       cm.state.sublimeMark.clear();
@@ -452,13 +450,13 @@
       cm.setCursor(found);
     }
   };
-  cmds[mapK[ctrl + "Y"] = "sublimeYank"] = function(cm) {
+  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
     if (cm.state.sublimeKilled != null)
       cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
   };
 
-  mapK[ctrl + "G"] = "clearBookmarks";
-  cmds[mapK[ctrl + "C"] = "showInCenter"] = function(cm) {
+  map[cK + ctrl + "G"] = "clearBookmarks";
+  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
     var pos = cm.cursorCoords(null, "local");
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
@@ -530,7 +528,7 @@
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
-  mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";
+  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
 
   map[ctrl + "I"] = "findIncremental";
   map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
@@ -538,4 +536,5 @@
   map["F3"] = "findNext";
   map["Shift-F3"] = "findPrev";
 
+  CodeMirror.normalizeKeyMap(map);
 });
diff --git a/keymap/vim.js b/keymap/vim.js
index 14affb1ae9..ff71568847 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4490,7 +4490,6 @@
     }
 
     CodeMirror.keyMap.vim = {
-      nofallthrough: true,
       attach: attachVimMap,
       detach: detachVimMap
     };
@@ -4734,7 +4733,7 @@
         return true;
       }
       if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound);
+        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
       }
     }
 
@@ -4819,7 +4818,7 @@
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
+            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
           } else {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4ec22f66de..65fe0f5a82 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -86,7 +86,8 @@
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
       draggingText: false,
-      highlight: new Delayed() // stores highlight worker timeout
+      highlight: new Delayed(), // stores highlight worker timeout
+      keySeq: null  // Unfinished key sequence
     };
 
     // Override magic textarea content restore that IE sometimes does
@@ -303,15 +304,6 @@
     });
   }
 
-  function keyMapChanged(cm, old) {
-    if (old == cm.options.keyMap) return;
-
-    old = (old == CodeMirror.Init) ? null : getKeyMap(old);
-    var map = getKeyMap(cm.options.keyMap);
-    if (old && old.detach) old.detach(cm, map);
-    if (map.attach) map.attach(cm, old);
-  }
-
   function themeChanged(cm) {
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
       cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -2402,7 +2394,7 @@
     // possible when it is clear that nothing happened. hasSelection
     // will be the case when there is a lot of text in the textarea,
     // in which case reading its value would be expensive.
-    if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput)
+    if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
       return false;
     // See paste handler for more on the fakedLastChar kludge
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
@@ -3172,63 +3164,70 @@
     return done;
   }
 
-  // Collect the currently active keymaps.
-  function allKeyMaps(cm) {
-    var maps = cm.state.keyMaps.slice(0);
-    if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
-    maps.push(cm.options.keyMap);
-    return maps;
+  function lookupKeyForEditor(cm, name, handle) {
+    for (var i = 0; i < cm.state.keyMaps.length; i++) {
+      var result = lookupKey(name, cm.state.keyMaps[i], handle);
+      if (result) return result;
+    }
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle))
+      || lookupKey(name, cm.options.keyMap, handle);
+  }
+
+  var stopSeq = new Delayed;
+  function dispatchKey(cm, name, e, handle) {
+    var seq = cm.state.keySeq;
+    if (seq) {
+      if (isModifierKey(name)) return "handled";
+      stopSeq.set(50, function() {
+        if (cm.state.keySeq == seq) {
+          cm.state.keySeq = null;
+          resetInput(cm);
+        }
+      });
+      name = seq + " " + name;
+    }
+    var result = lookupKeyForEditor(cm, name, handle);
+
+    if (result == "multi")
+      cm.state.keySeq = name;
+    if (result == "handled")
+      signalLater(cm, "keyHandled", cm, name, e);
+
+    if (result == "handled" || result == "multi") {
+      e_preventDefault(e);
+      restartBlink(cm);
+    }
+
+    if (seq && !result && /\'$/.test(name)) {
+      e_preventDefault(e);
+      return true;
+    }
+    return !!result;
   }
 
-  var maybeTransition;
   // Handle a key from the keydown event.
   function handleKeyBinding(cm, e) {
-    // Handle automatic keymap transitions
-    var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
-    clearTimeout(maybeTransition);
-    if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-      if (getKeyMap(cm.options.keyMap) == startMap) {
-        var old = cm.options.keyMap;
-        cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm, old);
-      }
-    }, 50);
-
-    var name = keyName(e, true), handled = false;
+    var name = keyName(e, true);
     if (!name) return false;
-    var keymaps = allKeyMaps(cm);
 
-    if (e.shiftKey) {
+    if (e.shiftKey && !cm.state.keySeq) {
       // First try to resolve full name (including 'Shift-'). Failing
       // that, see if there is a cursor-motion command (starting with
       // 'go') bound to the keyname without 'Shift-'.
-      handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
-             || lookupKey(name, keymaps, function(b) {
-                  if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                    return doHandleBinding(cm, b);
-                });
+      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+          || dispatchKey(cm, name, e, function(b) {
+               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                 return doHandleBinding(cm, b);
+             });
     } else {
-      handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
-    }
-
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, name, e);
+      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
     }
-    return handled;
   }
 
   // Handle a key from the keypress event
   function handleCharBinding(cm, e, ch) {
-    var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
-                            function(b) { return doHandleBinding(cm, b, true); });
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
-    }
-    return handled;
+    return dispatchKey(cm, "'" + ch + "'", e,
+                       function(b) { return doHandleBinding(cm, b, true); });
   }
 
   var lastStoppedKey = null;
@@ -4030,12 +4029,12 @@
     getDoc: function() {return this.doc;},
 
     addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](map);
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
     },
     removeKeyMap: function(map) {
       var maps = this.state.keyMaps;
       for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
+        if (maps[i] == map || maps[i].name == map) {
           maps.splice(i, 1);
           return true;
         }
@@ -4508,7 +4507,12 @@
     themeChanged(cm);
     guttersChanged(cm);
   }, true);
-  option("keyMap", "default", function(cm, val, old) { keyMapChanged(cm, old); });
+  option("keyMap", "default", function(cm, val, old) {
+    var next = getKeyMap(val);
+    var prev = old != CodeMirror.Init && getKeyMap(old);
+    if (prev && prev.detach) prev.detach(cm, next);
+    if (next.attach) next.attach(cm, prev || null);
+  });
   option("extraKeys", null);
 
   option("lineWrapping", false, wrappingChanged, true);
@@ -4853,9 +4857,11 @@
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
 
+
   // STANDARD KEYMAPS
 
   var keyMap = CodeMirror.keyMap = {};
+
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
@@ -4877,6 +4883,13 @@
     "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
     fallthrough: "basic"
   };
+  // Very basic readline/emacs-style bindings, which are standard on Mac.
+  keyMap.emacsy = {
+    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
+    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
+  };
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
     "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
@@ -4887,70 +4900,100 @@
     "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
     fallthrough: ["basic", "emacsy"]
   };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
 
   // KEYMAP DISPATCH
 
-  function getKeyMap(val) {
-    if (typeof val == "string") return keyMap[val];
-    else return val;
-  }
-
-  // Given an array of keymaps and a key name, call handle on any
-  // bindings found, until that returns a truthy value, at which point
-  // we consider the key handled. Implements things like binding a key
-  // to false stopping further handling and keymap fallthrough.
-  var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
-    function lookup(map) {
-      map = getKeyMap(map);
-      var found = map[name];
-      if (found === false) return "stop";
-      if (found != null && handle(found)) return true;
-      if (map.nofallthrough) return "stop";
-
-      var fallthrough = map.fallthrough;
-      if (fallthrough == null) return false;
-      if (Object.prototype.toString.call(fallthrough) != "[object Array]")
-        return lookup(fallthrough);
-      for (var i = 0; i < fallthrough.length; ++i) {
-        var done = lookup(fallthrough[i]);
-        if (done) return done;
+  function normalizeKeyName(name) {
+    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
+    var alt, ctrl, shift, cmd;
+    for (var i = 0; i < parts.length - 1; i++) {
+      var mod = parts[i];
+      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
+      else if (/^a(lt)?$/i.test(mod)) alt = true;
+      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
+      else if (/^s(hift)$/i.test(mod)) shift = true;
+      else throw new Error("Unrecognized modifier name: " + mod);
+    }
+    if (alt) name = "Alt-" + name;
+    if (ctrl) name = "Ctrl-" + name;
+    if (cmd) name = "Cmd-" + name;
+    if (shift) name = "Shift-" + name;
+    return name;
+  }
+
+  // This is a kludge to keep keymaps mostly working as raw objects
+  // (backwards compatibility) while at the same time support features
+  // like normalization and multi-stroke key bindings. It compiles a
+  // new normalized keymap, and then updates the old object to reflect
+  // this.
+  CodeMirror.normalizeKeyMap = function(keymap) {
+    var copy = {};
+    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+      var value = keymap[keyname];
+      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
+      if (value == "...") { delete keymap[keyname]; continue; }
+
+      var keys = map(keyname.split(" "), normalizeKeyName);
+      for (var i = 0; i < keys.length; i++) {
+        var val, name;
+        if (i == keys.length - 1) {
+          name = keyname;
+          val = value;
+        } else {
+          name = keys.slice(0, i + 1).join(" ");
+          val = "...";
+        }
+        var prev = copy[name];
+        if (!prev) copy[name] = val;
+        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
       }
-      return false;
+      delete keymap[keyname];
     }
+    for (var prop in copy) keymap[prop] = copy[prop];
+    return keymap;
+  };
 
-    for (var i = 0; i < maps.length; ++i) {
-      var done = lookup(maps[i]);
-      if (done) return done != "stop";
+  var lookupKey = CodeMirror.lookupKey = function(key, map, handle) {
+    map = getKeyMap(map);
+    var found = map[key];
+    if (found === false) return "nothing";
+    if (found === "...") return "multi";
+    if (found != null && handle(found)) return "handled";
+
+    if (map.fallthrough) {
+      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+        return lookupKey(key, map.fallthrough, handle);
+      for (var i = 0; i < map.fallthrough.length; i++) {
+        var result = lookupKey(key, map.fallthrough[i], handle);
+        if (result) return result;
+      }
     }
   };
 
   // Modifier key presses don't count as 'real' key presses for the
   // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(event) {
-    var name = keyNames[event.keyCode];
+  var isModifierKey = CodeMirror.isModifierKey = function(value) {
+    var name = typeof value == "string" ? value : keyNames[value.keyCode];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   };
 
   // Look up the name of a key as indicated by an event object.
   var keyName = CodeMirror.keyName = function(event, noShift) {
     if (presto && event.keyCode == 34 && event["char"]) return false;
-    var name = keyNames[event.keyCode];
+    var base = keyNames[event.keyCode], name = base;
     if (name == null || event.altGraphKey) return false;
-    if (event.altKey) name = "Alt-" + name;
-    if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name;
-    if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
-    if (!noShift && event.shiftKey) name = "Shift-" + name;
+    if (event.altKey && base != "Alt") name = "Alt-" + name;
+    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
+    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
+    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
     return name;
   };
 
+  function getKeyMap(val) {
+    return typeof val == "string" ? keyMap[val] : val;
+  }
+
   // FROMTEXTAREA
 
   CodeMirror.fromTextArea = function(textarea, options) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 12cafa1193..c9c8a6aa8d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -143,9 +143,9 @@ function testVim(name, run, opts, expectedFail) {
         for (var i = 0; i < arguments.length; i++) {
           var key = arguments[i];
           // Find key in keymap and handle.
-          var handled = CodeMirror.lookupKey(key, ['vim-insert'], executeHandler);
+          var handled = CodeMirror.lookupKey(key, 'vim-insert', executeHandler);
           // Record for insert mode.
-          if (handled === true && cm.state.vim.insertMode && arguments[i] != 'Esc') {
+          if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
             var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
             if (lastChange) {
               lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));

From 94afd115199793bd3cf619f2bc403afa826c09a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 23:10:31 +0100
Subject: [PATCH 17/71] Update the manual to reflect new keymap situation

---
 doc/manual.html | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 051a2178ae..64660af8df 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -702,26 +702,36 @@ <h3 id=modloader>Module loaders</h3>
     names defined here are <code>Enter</code>, <code>F5</code>,
     and <code>Q</code>. These can be prefixed
     with <code>Shift-</code>, <code>Cmd-</code>, <code>Ctrl-</code>,
-    and <code>Alt-</code> (in that order!) to specify a modifier. So
-    for example, <code>Shift-Ctrl-Space</code> would be a valid key
+    and <code>Alt-</code> to specify a modifier. So for
+    example, <code>Shift-Ctrl-Space</code> would be a valid key
     identifier.</p>
 
     <p>Common example: map the Tab key to insert spaces instead of a tab
     character.</p>
 
     <pre data-lang="javascript">
-{
+editor.setOption("extraKeys", {
   Tab: function(cm) {
     var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
     cm.replaceSelection(spaces);
   }
-}</pre>
+});</pre>
 
     <p>Alternatively, a character can be specified directly by
     surrounding it in single quotes, for example <code>'$'</code>
     or <code>'q'</code>. Due to limitations in the way browsers fire
     key events, these may not be prefixed with modifiers.</p>
 
+    <p id="normalizeKeyMap">Multi-stroke key bindings can be specified
+    by separating the key names by spaces in the property name, for
+    example <code>Ctrl-X Ctrl-V</code>. When a map contains
+    multi-stoke bindings or keys with modifiers that are not specified
+    in the default order (<code>Shift-Cmd-Ctrl-Alt</code>), you must
+    call <code>CodeMirror.normalizeKeyMap</code> on it before it can
+    be used. This function takes a keymap and modifies it to normalize
+    modifier order and properly recognize multi-stroke bindings. It
+    will return the keymap itself.</p>
+
     <p>The <code>CodeMirror.keyMap</code> object associates key maps
     with names. User code and key map definitions can assign extra
     properties to this object. Anywhere where a key map is expected, a
@@ -740,7 +750,8 @@ <h3 id=modloader>Module loaders</h3>
     behavior) should be given a turn.</p>
 
     <p>Keys mapped to command names that start with the
-    characters <code>"go"</code> (which should be used for
+    characters <code>"go"</code> or to functions that have a
+    truthy <code>motion</code> property (which should be used for
     cursor-movement actions) will be fired even when an
     extra <code>Shift</code> modifier is present (i.e. <code>"Up":
     "goLineUp"</code> matches both up and shift-up). This is used to
@@ -752,14 +763,15 @@ <h3 id=modloader>Module loaders</h3>
     be searched. It can hold either a single key map or an array of
     key maps.</p>
 
-    <p>When a key map contains a <code>nofallthrough</code> property
-    set to <code>true</code>, keys matched against that map will be
-    ignored if they don't match any of the bindings in the map (no
-    further child maps will be tried). When
-    the <code>disableInput</code> property is set
-    to <code>true</code>, the default effect of inserting a character
-    will be suppressed when the key map is active as the top-level
-    map.</p>
+    <p>When a key map needs to set something up when it becomes
+    active, or tear something down when deactivated, it can
+    contain <code>attach</code> and/or <code>detach</code> properties,
+    which should hold functions that take the editor instance and the
+    next or previous keymap. Note that this only works for the
+    <a href="#option_keyMap">top-level keymap</a>, not for fallthrough
+    maps or maps added
+    with <a href="#option_extraKeys"><code>extraKeys</code></a>
+    or <a href="#addKeyMap"><code>addKeyMap</code></a>.</p>
 </section>
 
 <section id=commands>

From 5397cbe835fd5fbe1fabba7a0ad487310d9df253 Mon Sep 17 00:00:00 2001
From: Scott Goodhew <sgoodhew@atlassian.com>
Date: Wed, 29 Oct 2014 16:14:22 +1100
Subject: [PATCH 18/71] [meta addon] Added Django and RPM modes

---
 mode/meta.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index cee33e5422..61a1eae9fa 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -27,6 +27,7 @@
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "Django", mime: "text/x-django", mode: "django"},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
@@ -83,6 +84,8 @@
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
     {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
     {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
+    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
     {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
     {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
     {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},

From f88df5c5696ed425eff6776d84f3b1304326e7cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 14:51:04 +0100
Subject: [PATCH 19/71] Don't blindly refresh on resize event, compare new size
 instead

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 65fe0f5a82..98ba04d994 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -199,7 +199,7 @@
     d.externalMeasured = null;
     // Empty space (in pixels) above the view
     d.viewOffset = 0;
-    d.lastSizeC = 0;
+    d.lastWrapHeight = d.lastWrapWidth = 0;
     d.updateLineNumbers = null;
 
     // Used to only resize the line number gutter when necessary (when
@@ -548,6 +548,7 @@
     this.visible = visibleLines(display, cm.doc, viewport);
     this.editorIsHidden = !display.wrapper.offsetWidth;
     this.wrapperHeight = display.wrapper.clientHeight;
+    this.wrapperWidth = display.wrapper.clientWidth;
     this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo;
     this.oldScrollerWidth = display.scroller.clientWidth;
     this.force = force;
@@ -588,7 +589,7 @@
     }
 
     var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastSizeC != update.wrapperHeight;
+      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
     adjustView(cm, from, to);
 
     display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
@@ -616,7 +617,8 @@
     removeChildren(display.selectionDiv);
 
     if (different) {
-      display.lastSizeC = update.wrapperHeight;
+      display.lastWrapHeight = update.wrapperHeight;
+      display.lastWrapWidth = update.wrapperWidth;
       startWorker(cm, 400);
     }
 
@@ -2649,8 +2651,10 @@
 
   // Called when the window resizes
   function onResize(cm) {
-    // Might be a text scaling operation, clear size caches.
     var d = cm.display;
+    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+      return;
+    // Might be a text scaling operation, clear size caches.
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
     cm.setSize();
   }

From cb403a8996cf2a6f9a01999d3ebeec73d4f81d17 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 22:03:33 +0100
Subject: [PATCH 20/71] [closebrackets demo] Make mode match editor content

---
 demo/closebrackets.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 45da4ebf87..d702f52696 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/closebrackets.js"></script>
-<script src="../mode/xml/xml.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>

From ebc66a348e4f3449ac6470eb02b2e07989492a62 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 22:08:16 +0100
Subject: [PATCH 21/71] [closebrackets addon] Count quotes as okay to autoclose
 in front of

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

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 32eca014c5..f6b42f02d3 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -71,7 +71,7 @@
     };
     var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      if (left != right) closingBrackets += right;
+      closingBrackets += right;
       map["'" + left + "'"] = function(cm) {
         if (cm.getOption("disableInput")) return CodeMirror.Pass;
         var ranges = cm.listSelections(), type, next;

From aaec99e351229c71db938720e2e6c4e0e7c9c1ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Oct 2014 10:41:27 +0100
Subject: [PATCH 22/71] Work around Webkit wrapping issue

Issue #2901
---
 lib/codemirror.css | 3 +++
 lib/codemirror.js  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 074dd41b12..eba9a5d8b5 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -306,5 +306,8 @@ div.CodeMirror-cursors {
   }
 }
 
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 98ba04d994..a3079206ef 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6015,9 +6015,14 @@
       }
     }
 
+    // See issue #2901
+    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
+      builder.content.className = "cm-tab-wrap-hack";
+
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
     if (builder.pre.className)
       builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
+
     return builder;
   }
 

From 117e25294d91b947099d46a01b71f79773bb567e Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 31 Oct 2014 13:37:38 -0700
Subject: [PATCH 23/71] Workaround for an error in getting to insert mode.  It
 was very difficult to reproduce, and I don't know what led to it, but the ">"
 mark was set but returned undefined when find() was called.  This should work
 around the problem if it happens again.

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

diff --git a/keymap/vim.js b/keymap/vim.js
index ff71568847..6da449a5c1 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1816,7 +1816,10 @@
         lastInsertModeChanges.inVisualBlock = visualBlock;
         var replacement = new Array(selections.length).join('1').split('1');
         // save the selectionEnd mark
-        var selectionEnd = vim.marks['>'] ? vim.marks['>'].find() : cm.getCursor('head');
+        var selectionEnd = vim.marks[">"] && vim.marks[">"].find();
+        if (!selectionEnd) {
+          selectionEnd = cm.getCursor("head");
+        }
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'change', text,
             operatorArgs.linewise);

From 2b8106f669c016e9d110d225f63fd23247b54f9b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 2 Nov 2014 18:52:53 -0500
Subject: [PATCH 24/71] [vim] Make vim fail more gracefully

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 6da449a5c1..558e4c82a3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -732,8 +732,14 @@
 
         return cm.operation(function() {
           cm.curOp.isVimOp = true;
-          if (vim.insertMode) { return handleKeyInsertMode(); }
-          else { return handleKeyNonInsertMode(); }
+          try {
+            if (vim.insertMode) { return handleKeyInsertMode(); }
+            else { return handleKeyNonInsertMode(); }
+          } catch (e) {
+            // clear VIM state in case it's in a bad state.
+            cm.state.vim = undefined;
+            throw e;
+          }
         });
       },
       handleEx: function(cm, input) {

From 8173af6f05fa18455399698afc1b99aa6a5cd7bd Mon Sep 17 00:00:00 2001
From: Andrea G <muffo87@gmail.com>
Date: Sat, 1 Nov 2014 12:52:34 +0000
Subject: [PATCH 25/71] [3024-day theme] Change color of matching bracket

The color white is not visible on the current backgroung
---
 theme/3024-day.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/3024-day.css b/theme/3024-day.css
index ebf46fb4a5..3c01c2bf58 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -35,4 +35,4 @@
 .cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 
 .cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important;}

From ef690441922a5ebf3e1e680e1e39011fe2ccaae7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 11:58:33 +0100
Subject: [PATCH 26/71] [markdown mode] Don't call tokenizer of code-block mode
 at end of line

Issue #2904
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 48464645bb..5aeb8cf320 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -208,7 +208,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // try switching mode
       state.localMode = getMode(RegExp.$1);
       if (state.localMode) state.localState = state.localMode.startState();
-      switchBlock(stream, state, local);
+      state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
       state.code = true;
       return getType(state);

From 1e7cdbf82dc08d06f995cdbb3e265547fb114e3a Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 31 Oct 2014 02:10:37 +0100
Subject: [PATCH 27/71] [markdown mode] Support leading whitespace in
 fencedCodeBlocks mode name

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 5aeb8cf320..3d1673bee0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -204,7 +204,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
+    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```[ \t]*([\w+#]*)/, true)) {
       // try switching mode
       state.localMode = getMode(RegExp.$1);
       if (state.localMode) state.localState = state.localMode.startState();

From 72cd628aad83ff2a8250ba7241d7613b67bd99f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 13:35:41 +0100
Subject: [PATCH 28/71] [real-world uses] Add interactive SICP link

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e9b6d45cce..8a87a0485b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -138,6 +138,7 @@
       <li><a href="http://snippets.pro/">Snippets.pro</a> (code snippet sharing)</li>
       <li><a href="http://www.solidshops.com/">SolidShops</a> (hosted e-commerce platform)</li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
+      <li><a href="http://xuanji.appspot.com/isicp/">Structure and Interpretation of Computer Programs</a>, Interactive Version</li>
       <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
       <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>

From 0c60c433efb8e37fad42251c49e08ef5b63d9f62 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 31 Oct 2014 19:04:26 +0100
Subject: [PATCH 29/71] [markdown mode, mode meta info] Add mode aliases to
 meta.js, add more aliases

Issue #2903
---
 mode/gfm/index.html       |  1 +
 mode/markdown/markdown.js | 30 +++++++++++++++++-------------
 mode/meta.js              | 42 +++++++++++++++++++++---------------------
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 60d108c1ca..7e38c52d60 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -14,6 +14,7 @@
 <script src="../css/css.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="../clike/clike.js"></script>
+<script src="../meta.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3d1673bee0..61aaa8ead7 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -15,26 +15,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
-  var aliases = {
-    html: "htmlmixed",
-    js: "javascript",
-    json: "application/json",
-    c: "text/x-csrc",
-    "c++": "text/x-c++src",
-    java: "text/x-java",
-    csharp: "text/x-csharp",
-    "c#": "text/x-csharp",
-    scala: "text/x-scala"
-  };
 
   var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime;
+    var i, modes = {}, mimes = {}, mime, aliases = {};
 
     var list = [];
     for (var m in CodeMirror.modes)
       if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m);
     for (i = 0; i < list.length; i++) {
-      modes[list[i]] = list[i];
+      modes[list[i].toLowerCase()] = list[i];
     }
     var mimesList = [];
     for (var m in CodeMirror.mimeModes)
@@ -45,12 +34,27 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       mimes[mime] = mimesList[i].mime;
     }
 
+    // Load aliases from meta.js
+    if (CodeMirror.modeInfo) {
+      var currentMode, aliasMode;
+      for (i = 0; i < CodeMirror.modeInfo.length; i++) {
+        currentMode = CodeMirror.modeInfo[i];
+        if (currentMode.alias) {
+          aliasMode = currentMode.mime || currentMode.mode;
+          for (var j = 0; j < currentMode.alias.length; j++) {
+            aliases[currentMode.alias[j].toLowerCase()] = aliasMode;
+          }
+        }
+      }
+    }
+
     for (var a in aliases) {
       if (aliases[a] in modes || aliases[a] in mimes)
         modes[a] = aliases[a];
     }
 
     return function (lang) {
+      lang = lang.toLowerCase();
       return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
     };
   }());
diff --git a/mode/meta.js b/mode/meta.js
index 61a1eae9fa..5f32fde00a 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -15,12 +15,12 @@
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
-    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
-    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
-    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"]},
-    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"]},
+    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
@@ -35,7 +35,7 @@
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
-    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
@@ -45,21 +45,21 @@
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
-    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"]},
-    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
     {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
     {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
-    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
     {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
-     mode: "javascript", ext: ["js"]},
-    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"]},
-    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
+     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", alias: ["jsonld"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
-    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
     {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
@@ -78,21 +78,21 @@
     {name: "Pig", mime: "text/x-pig", mode: "pig"},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql"},
-    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"]},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
-    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
-    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
     {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
     {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
-    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
     {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
     {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
     {name: "Sieve", mime: "application/sieve", mode: "sieve"},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
@@ -103,7 +103,7 @@
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"]},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
     {name: "Textile", mime: "text/x-textile", mode: "textile"},
@@ -112,14 +112,14 @@
     {name: "TOML", mime: "text/x-toml", mode: "toml"},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
-    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
-    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
-    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility

From e64cd58f0f3c69142c486e62b296007d7d64e2c7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 16:54:36 +0100
Subject: [PATCH 30/71] [mode metainfo] Add findModeByName function

---
 doc/manual.html | 11 ++++++-----
 mode/meta.js    | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 64660af8df..14c7879c10 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2612,11 +2612,12 @@ <h2 id="addons">Addons</h2>
       properties <code>mimes</code>, which holds an array of MIME
       types for modes with multiple MIMEs associated,
       and <code>ext</code>, which holds an array of file extensions
-      associated with this mode. Two convenience
-      functions, <code>CodeMirror.findModeByMIME</code>
-      and <code>CodeMirror.findModeByExtension</code> are provided,
-      which return such an object given a MIME or extension string.
-      Note that, for historical reasons, this file resides in the
+      associated with this mode. Three convenience
+      functions, <code>CodeMirror.findModeByMIME</code>,
+      and <code>CodeMirror.findModeByExtension</code>,
+      and <code>CodeMirror.findModeByName</code> are provided, which
+      return such an object given a MIME or extension string. Note
+      that, for historical reasons, this file resides in the
       top-level <code>mode</code> directory, not
       under <code>addon</code>. <a href="../demo/loadmode.html">Demo</a>.</dd>
 
diff --git a/mode/meta.js b/mode/meta.js
index 5f32fde00a..94acac76da 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -144,4 +144,14 @@
         if (info.ext[j] == ext) return info;
     }
   };
+
+  CodeMirror.findModeByName = function(name) {
+    name = name.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.name.toLowerCase() == name) return info;
+      if (info.alias) for (var j = 0; j < info.alias.length; j++)
+        if (info.alias[j].toLowerCase() == name) return info;
+    }
+  };
 });

From 263af5abd471832bd9eabe7c62da458447f7606c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 16:55:10 +0100
Subject: [PATCH 31/71] [markdown mode] Less complicated way of getting modes
 by name

---
 mode/markdown/markdown.js | 52 ++++++++---------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 61aaa8ead7..c39dc7e35b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", require("../xml/xml")));
+    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta.js")));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml"], mod);
+    define(["../../lib/codemirror", "../xml/xml", "../meta.js"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
@@ -16,48 +16,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
 
-  var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime, aliases = {};
-
-    var list = [];
-    for (var m in CodeMirror.modes)
-      if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m);
-    for (i = 0; i < list.length; i++) {
-      modes[list[i].toLowerCase()] = list[i];
-    }
-    var mimesList = [];
-    for (var m in CodeMirror.mimeModes)
-      if (CodeMirror.mimeModes.propertyIsEnumerable(m))
-        mimesList.push({mime: m, mode: CodeMirror.mimeModes[m]});
-    for (i = 0; i < mimesList.length; i++) {
-      mime = mimesList[i].mime;
-      mimes[mime] = mimesList[i].mime;
-    }
-
-    // Load aliases from meta.js
-    if (CodeMirror.modeInfo) {
-      var currentMode, aliasMode;
-      for (i = 0; i < CodeMirror.modeInfo.length; i++) {
-        currentMode = CodeMirror.modeInfo[i];
-        if (currentMode.alias) {
-          aliasMode = currentMode.mime || currentMode.mode;
-          for (var j = 0; j < currentMode.alias.length; j++) {
-            aliases[currentMode.alias[j].toLowerCase()] = aliasMode;
-          }
-        }
-      }
-    }
-
-    for (var a in aliases) {
-      if (aliases[a] in modes || aliases[a] in mimes)
-        modes[a] = aliases[a];
+  function getMode(name) {
+    if (CodeMirror.findModeByName) {
+      var found = CodeMirror.findModeByName(name);
+      if (found) name = found.mime || found.mimes[0];
     }
-
-    return function (lang) {
-      lang = lang.toLowerCase();
-      return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
-    };
-  }());
+    var mode = CodeMirror.getMode(cmCfg, name);
+    return mode.name == "null" ? null : mode;
+  }
 
   // Should characters that affect highlighting be highlighted separate?
   // Does not include characters that will be output (such as `1.` and `-` for lists)

From da3e8f283a5d47ad23666f715d3fcc774b962084 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 3 Nov 2014 15:35:05 +0100
Subject: [PATCH 32/71] Add getLineTokens method

---
 doc/manual.html   |  7 +++++++
 lib/codemirror.js | 37 +++++++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 14c7879c10..ef11e35868 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1842,6 +1842,13 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       edits were recently made and highlighting has not yet completed.
       </dd>
 
+      <dt id="getLineTokens"><code><strong>cm.getLineTokens</strong>(line: integer, ?precise: boolean) → array&lt;{start, end, string, type, state}&gt;</code></dt>
+      <dd>This is a (much) cheaper version
+      of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
+      when you need to have all the tokens in a given line. Returns
+      an array of objects which have the same properties
+      <a href="#getTokenAt"><code>getTokenAt</code></a> has.</dd>
+
       <dt id="getTokenTypeAt"><code><strong>cm.getTokenTypeAt</strong>(pos: {line, ch}) → string</code></dt>
       <dd>This is a (much) cheaper version
       of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a3079206ef..399c5b3217 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4095,20 +4095,11 @@
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      var doc = this.doc;
-      pos = clipPos(doc, pos);
-      var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
-      var line = getLine(doc, pos.line);
-      var stream = new StringStream(line.text, this.options.tabSize);
-      while (stream.pos < pos.ch && !stream.eol()) {
-        stream.start = stream.pos;
-        var style = readToken(mode, stream, state);
-      }
-      return {start: stream.start,
-              end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: state};
+      return getToken(this, pos, precise, "single");
+    },
+
+    getLineTokens: function(line, precise) {
+      return getToken(this, {line: line}, precise, "line");
     },
 
     getTokenTypeAt: function(pos) {
@@ -5855,6 +5846,24 @@
     throw new Error("Mode " + mode.name + " failed to advance stream.");
   }
 
+  // Utility for getTokenAt and getLineTokens
+  function getToken(cm, pos, precise, context) {
+    function getObj() {
+      return {start: stream.start, end: stream.pos, string: stream.current(), type: style || null, state: copyState(doc.mode, state)};
+    }
+    var doc = cm.doc, mode = doc.mode, style;
+    pos = clipPos(doc, pos);
+    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
+    var stream = new StringStream(line.text, cm.options.tabSize);
+    var createArray = context == "line", tokens = [];
+    while ((createArray || stream.pos < pos.ch) && !stream.eol()) {
+      stream.start = stream.pos;
+      style = readToken(mode, stream, state);
+      if (createArray) tokens.push(getObj());
+    }
+    return createArray ? tokens : getObj();
+  }
+
   // Run the given mode's parser over a line, calling f for each token.
   function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     var flattenSpans = mode.flattenSpans;

From 71ef0cfec056c34eae61b16f86a17ecfc7d8d286 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Nov 2014 12:58:42 +0100
Subject: [PATCH 33/71] Clean up getLineTokens, add test

Issue #2908
---
 doc/manual.html   | 10 +++++-----
 lib/codemirror.js | 24 ++++++++++++++----------
 test/test.js      | 14 +++++++++++++-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ef11e35868..5d02b32436 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1843,11 +1843,11 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       </dd>
 
       <dt id="getLineTokens"><code><strong>cm.getLineTokens</strong>(line: integer, ?precise: boolean) → array&lt;{start, end, string, type, state}&gt;</code></dt>
-      <dd>This is a (much) cheaper version
-      of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
-      when you need to have all the tokens in a given line. Returns
-      an array of objects which have the same properties
-      <a href="#getTokenAt"><code>getTokenAt</code></a> has.</dd>
+      <dd>This is similar
+      to <a href="#getTokenAt"><code>getTokenAt</code></a>, but
+      collects all tokens for a given line into an array. It is much
+      cheaper than repeatedly calling <code>getTokenAt</code>, which
+      re-parses the part of the line before the token for every call.</dd>
 
       <dt id="getTokenTypeAt"><code><strong>cm.getTokenTypeAt</strong>(pos: {line, ch}) → string</code></dt>
       <dd>This is a (much) cheaper version
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 399c5b3217..725324d29e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4095,11 +4095,11 @@
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      return getToken(this, pos, precise, "single");
+      return takeToken(this, pos, precise);
     },
 
     getLineTokens: function(line, precise) {
-      return getToken(this, {line: line}, precise, "line");
+      return takeToken(this, Pos(line), precise, true);
     },
 
     getTokenTypeAt: function(pos) {
@@ -5847,21 +5847,25 @@
   }
 
   // Utility for getTokenAt and getLineTokens
-  function getToken(cm, pos, precise, context) {
-    function getObj() {
-      return {start: stream.start, end: stream.pos, string: stream.current(), type: style || null, state: copyState(doc.mode, state)};
+  function takeToken(cm, pos, precise, asArray) {
+    function getObj(copy) {
+      return {start: stream.start, end: stream.pos,
+              string: stream.current(),
+              type: style || null,
+              state: copy ? copyState(doc.mode, state) : state};
     }
+
     var doc = cm.doc, mode = doc.mode, style;
     pos = clipPos(doc, pos);
     var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize);
-    var createArray = context == "line", tokens = [];
-    while ((createArray || stream.pos < pos.ch) && !stream.eol()) {
+    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+    if (asArray) tokens = [];
+    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
       stream.start = stream.pos;
       style = readToken(mode, stream, state);
-      if (createArray) tokens.push(getObj());
+      if (asArray) tokens.push(getObj(true));
     }
-    return createArray ? tokens : getObj();
+    return asArray ? tokens : getObj();
   }
 
   // Run the given mode's parser over a line, calling f for each token.
diff --git a/test/test.js b/test/test.js
index 4e7de08818..e437c589f6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -3,7 +3,7 @@ var Pos = CodeMirror.Pos;
 CodeMirror.defaults.rtlMoveVisually = true;
 
 function forEach(arr, f) {
-  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
+  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i], i);
 }
 
 function addDoc(cm, width, height) {
@@ -1975,6 +1975,18 @@ testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
   eq(cm.getValue(), "Va");
 }, {value: "a"});
 
+testCM("getTokenAt", function(cm) {
+  var tokPlus = cm.getTokenAt(Pos(0, 2));
+  eq(tokPlus.type, "operator");
+  eq(tokPlus.string, "+");
+  var toks = cm.getLineTokens(0);
+  eq(toks.length, 3);
+  forEach([["number", "1"], ["operator", "+"], ["number", "2"]], function(expect, i) {
+    eq(toks[i].type, expect[0]);
+    eq(toks[i].string, expect[1]);
+  });
+}, {value: "1+2", mode: "javascript"});
+
 testCM("getTokenTypeAt", function(cm) {
   eq(cm.getTokenTypeAt(Pos(0, 0)), "number");
   eq(cm.getTokenTypeAt(Pos(0, 6)), "string");

From 5a400b673fedc8b008d3addb095c53fca3d1c238 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Nov 2014 13:24:51 +0100
Subject: [PATCH 34/71] [xml-hint addon] Properly complete tags when directly
 after >

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

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index e31b09b5fc..d460959d97 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -21,7 +21,9 @@
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;
-    var tag = /\btag\b/.test(token.type), tagName = tag && /^\w/.test(token.string), tagStart;
+    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
+    var tagName = tag && /^\w/.test(token.string), tagStart;
+
     if (tagName) {
       var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
       var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
@@ -31,6 +33,7 @@
     } else if (tag && token.string == "</") {
       tagType = "close";
     }
+
     if (!tag && !inner.state.tagName || tagType) {
       if (tagName)
         prefix = token.string;

From 0c344f93bab724e5f696b0891174c2f1751f4836 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:23:39 +0400
Subject: [PATCH 35/71] [vim] clear input state after search and ex commands

without this pressing / and then Esc doesn't clear status line
---
 keymap/vim.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 558e4c82a3..15dd8f8956 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -994,10 +994,12 @@
             break;
           case 'search':
             this.processSearch(cm, vim, command);
+            clearInputState(cm);
             break;
           case 'ex':
           case 'keyToEx':
             this.processEx(cm, vim, command);
+            clearInputState(cm);
             break;
           default:
             break;

From db3d8c090862d5326b741c0853eb7c1ace494b35 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:24:43 +0400
Subject: [PATCH 36/71] [vim] cleanup

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 15dd8f8956..7a7dcdd29f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -557,9 +557,7 @@
           visualLine: false,
           visualBlock: false,
           lastSelection: null,
-          lastPastedText: null,
-          // Used by two-character ESC keymap routines. Should not be changed from false here.
-          awaitingEscapeSecondCharacter: false
+          lastPastedText: null
         };
       }
       return cm.state.vim;
@@ -3791,10 +3789,10 @@
       { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
       { name: 'global', shortName: 'g' }
     ];
-    Vim.ExCommandDispatcher = function() {
+    var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
-    Vim.ExCommandDispatcher.prototype = {
+    ExCommandDispatcher.prototype = {
       processCommand: function(cm, input, opt_params) {
         var vim = cm.state.vim;
         var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
@@ -4393,7 +4391,7 @@
       }
     };
 
-    var exCommandDispatcher = new Vim.ExCommandDispatcher();
+    var exCommandDispatcher = new ExCommandDispatcher();
 
     /**
     * @param {CodeMirror} cm CodeMirror instance we are in.
diff --git a/test/vim_test.js b/test/vim_test.js
index c9c8a6aa8d..d057b4b3d5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1723,7 +1723,7 @@ testVim('visual', function(cm, vim, helpers) {
 }, { value: '12345' });
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
-  eq(cm.getCursor('anchor'), cm.getCursor('head'));
+  eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
   eq(vim.visualMode, false);
 }, { value: 'hello\nworld\nfoo' });
 testVim('visual_line', function(cm, vim, helpers) {

From b229dddcf3a5d2652f0761b3a0a6d7e325c4908f Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:25:31 +0400
Subject: [PATCH 37/71] [vim] handleKeys should return true after jk in insert
 mode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 7a7dcdd29f..8a7945ed08 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -697,7 +697,7 @@
           } else {
             commandDispatcher.processCommand(cm, vim, command);
           }
-          return !keysAreChars;
+          return true;
         }
 
         function handleKeyNonInsertMode() {

From a187f5bb01b0cd326497044e30d9e3ac345c4ac9 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 20:10:10 +0400
Subject: [PATCH 38/71] [vim] do not throw when entering insert mode

---
 keymap/vim.js    | 2 +-
 test/vim_test.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8a7945ed08..3ed95190b2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2105,7 +2105,7 @@
             selectionStart = Pos(selectionStart.line, selectionEnd.ch);
             cm.setCursor(selectionStart);
             selectBlock(cm, selectionEnd);
-          } else if (selectionEnd.line < selectionStart.line) {
+          } else if (selectionEnd && selectionEnd.line < selectionStart.line) {
             selectionEnd = Pos(selectionStart.line, 0);
             cm.setCursor(selectionEnd);
           }
diff --git a/test/vim_test.js b/test/vim_test.js
index d057b4b3d5..7f016c479b 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1304,6 +1304,11 @@ testVim('A_visual_block', function(cm, vim, helpers) {
   replacement.pop();
   cm.replaceSelections(replacement);
   eq('testhello\nmehello\npleahellose', cm.getValue());
+  helpers.doKeys('<Esc>');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  // TODO this doesn't work yet
+  // eq('teshellothello\nme hello hello\nplehelloahellose', cm.getValue());
 }, {value: 'test\nme\nplease'});
 testVim('I', function(cm, vim, helpers) {
   cm.setCursor(0, 4);

From 9dfdf7c277a3585188b7ff63bfe46bc03ac8f2a8 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 20:17:00 +0400
Subject: [PATCH 39/71] [vim] fix typeError when pressing wrong key in
 substitute confirm

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 3ed95190b2..66f2077674 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4479,6 +4479,7 @@
             break;
         }
         if (done) { stop(close); }
+        return true;
       }
 
       // Actually do replace.

From dbd3381856110ba970bf10c453d518449558f768 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 13:13:40 +0100
Subject: [PATCH 40/71] [authors list] Add a name

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 5d0740fe9d..c6e7505f2f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,6 +35,7 @@ Anderson Mesquita
 Andreas Reischuck
 Andre von Houck
 Andrey Fedorov
+Andrey Klyuchnikov
 Andrey Lushnikov
 Andy Joslin
 Andy Kimball

From 25210144d920d5934a72062cd6806712e1333d68 Mon Sep 17 00:00:00 2001
From: Dale Jung <dale@dalejung.com>
Date: Thu, 6 Nov 2014 22:02:24 -0500
Subject: [PATCH 41/71] [markdown mode] Properly import mode/meta dependency

Issue #2914
---
 mode/markdown/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index c39dc7e35b..d64bfdb6b0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta.js")));
+    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta")));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml", "../meta.js"], mod);
+    define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {

From 69b4a9cc1e0ebd027224de5730e2a63377565780 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 14:33:12 +0100
Subject: [PATCH 42/71] [project page] Remove confusing option from example

You won't get much effect from setting the mode option when
no modes are loaded.

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

diff --git a/index.html b/index.html
index 8dcd378332..03b4fd6793 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@
 <script src="lib/codemirror.js"></script>
 <script>
   var editor = CodeMirror.fromTextArea(myTextarea, {
-    mode: "text/html"
+    lineNumbers: true
   });
 </script></textarea>
   <select id="demolist" onchange="document.location = this.options[this.selectedIndex].value;">

From e2962a5b0df56c8ee5a4482899d308decf3d7677 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 16:56:50 +0100
Subject: [PATCH 43/71] Add experimental scrollCursorIntoView event

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 725324d29e..05795e244f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3710,6 +3710,8 @@
   // If an editor sits on the top or bottom of the window, partially
   // scrolled out of view, this ensures that the cursor is visible.
   function maybeScrollWindow(cm, coords) {
+    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
+
     var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
@@ -7238,6 +7240,8 @@
   // registering a (non-DOM) handler on the editor for the event name,
   // and preventDefault-ing the event in that handler.
   function signalDOMEvent(cm, e, override) {
+    if (typeof e == "string")
+      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
     signal(cm, override || e.type, cm, e);
     return e_defaultPrevented(e) || e.codemirrorIgnore;
   }

From fa0294e3de5de82d9820ee049883f32bf524814b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:13:31 +0100
Subject: [PATCH 44/71] Document scrollCursorIntoView event

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

diff --git a/doc/manual.html b/doc/manual.html
index 5d02b32436..736be44d5f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -576,6 +576,13 @@ <h3 id=modloader>Module loaders</h3>
       <dt id="event_scroll"><code><strong>"scroll"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires when the editor is scrolled.</dd>
 
+      <dt id="event_scrollCursorIntoView"><code><strong>"scrollCursorIntoView"</strong> (instance: CodeMirror, event: Event)</code></dt>
+      <dd>Fires when the editor tries to scroll its cursor into view.
+      Can be hooked into to take care of additional scrollable
+      containers around the editor. When the event object has
+      its <code>preventDefault</code> method called, CodeMirror will
+      not itself try to scroll the window.</dd>
+
       <dt id="event_update"><code><strong>"update"</strong> (instance: CodeMirror)</code></dt>
       <dd>Will be fired whenever CodeMirror updates its DOM display.</dd>
 

From 2c5d652f880722996364da40b3e2f27d308923bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:24:52 +0100
Subject: [PATCH 45/71] [xml-hint addon] Work properly when the cursor is
 directly after < or </

See http://discuss.codemirror.net/t/html-hints-not-working-just-after/45/6
---
 addon/hint/xml-hint.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index d460959d97..cc95b20f34 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -18,6 +18,11 @@
     var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (/^<\/?$/.test(token.string) && token.end == cur.ch) {
+      var nextToken = cm.getTokenAt(Pos(cur.line, cur.ch + 1));
+      if (nextToken.start == cur.ch && /\btag\b/.test(nextToken.type))
+        token = nextToken;
+    }
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;

From 02dc00c8d2a77845b2c4000e624f9af6ef80bc30 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:30:55 +0100
Subject: [PATCH 46/71] [yaml mode] Highlight strings

This also helps closebrackets close quotes

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

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 332aef6a23..b7015e599c 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -23,8 +23,13 @@ CodeMirror.defineMode("yaml", function() {
       state.escaped = false;
       /* comments */
       if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-        stream.skipToEnd(); return "comment";
+        stream.skipToEnd();
+        return "comment";
       }
+
+      if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))
+        return "string";
+
       if (state.literal && stream.indentation() > state.keyCol) {
         stream.skipToEnd(); return "string";
       } else if (state.literal) { state.literal = false; }

From 0930f2bfdad9ab0bf3b3c5703eda378eeb69d304 Mon Sep 17 00:00:00 2001
From: paris <paris@sourcelair.com>
Date: Thu, 23 Oct 2014 12:51:35 +0300
Subject: [PATCH 47/71] [dockerfile mode] Add

---
 mode/dockerfile/dockerfile.js | 91 +++++++++++++++++++++++++++++++++++++++++++
 mode/dockerfile/index.html    | 72 ++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 mode/dockerfile/dockerfile.js
 create mode 100644 mode/dockerfile/index.html

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
new file mode 100644
index 0000000000..9444878699
--- /dev/null
+++ b/mode/dockerfile/dockerfile.js
@@ -0,0 +1,91 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  // Collect all Dockerfile directives
+  var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
+                      "add", "copy", "entrypoint", "volume", "user",
+                      "workdir", "onbuild"],
+      instructionRegex = "(" + instructions.join('|') + ")",
+      instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
+      instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
+
+  CodeMirror.defineSimpleMode("dockerfile", {
+    start: [
+      // Block comment: This is a line starting with a comment
+      {
+        regex: /#.*$/,
+        token: "comment",
+        next: "start"
+      },
+      // Highlight an instruction without any arguments (for convenience)
+      {
+        regex: instructionOnlyLine,
+        token: "variable-2",
+        next: "start"
+      },
+      // Highlight an instruction followed by arguments
+      {
+        regex: instructionWithArguments,
+        token: ["variable-2", null],
+        next: "arguments"
+      },
+      // Fail-safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    arguments: [
+      {
+        // Line comment without instruction arguments is an error
+        regex: /#.*$/,
+        token: "error",
+        next: "start"
+      },
+      {
+        regex: /[^#]+\\$/,
+        token: null,
+        next: "arguments"
+      },
+      {
+        // Match everything except for the inline comment
+        regex: /[^#]+/,
+        token: null,
+        next: "lineComment"
+      },
+      {
+        regex: /$/,
+        token: null,
+        next: "start"
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    lineComment: [
+      {
+        regex: /#.*$/,
+        token: "comment"
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ]
+  });
+
+  CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
+});
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
new file mode 100644
index 0000000000..564f6c52c1
--- /dev/null
+++ b/mode/dockerfile/index.html
@@ -0,0 +1,72 @@
+<!doctype html>
+
+<title>CodeMirror: Dockerfile mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/simple.js"></script>
+<script src="dockerfile.js"></script>
+<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Dockerfile</a>
+  </ul>
+</div>
+
+<article>
+<h2>Dockerfile mode</h2>
+<form><textarea id="code" name="code"># Install Ghost blogging platform and run development environment
+#
+# VERSION 1.0.0
+
+FROM ubuntu:12.10
+MAINTAINER Amer Grgic "amer@livebyt.es"
+WORKDIR /data/ghost
+
+# Install dependencies for nginx installation
+RUN apt-get update
+RUN apt-get install -y python g++ make software-properties-common --force-yes
+RUN add-apt-repository ppa:chris-lea/node.js
+RUN apt-get update
+# Install unzip
+RUN apt-get install -y unzip
+# Install curl
+RUN apt-get install -y curl
+# Install nodejs & npm
+RUN apt-get install -y rlwrap
+RUN apt-get install -y nodejs 
+# Download Ghost v0.4.1
+RUN curl -L https://ghost.org/zip/ghost-latest.zip -o /tmp/ghost.zip
+# Unzip Ghost zip to /data/ghost
+RUN unzip -uo /tmp/ghost.zip -d /data/ghost
+# Add custom config js to /data/ghost
+ADD ./config.example.js /data/ghost/config.js
+# Install Ghost with NPM
+RUN cd /data/ghost/ && npm install --production
+# Expose port 2368
+EXPOSE 2368
+# Run Ghost
+CMD ["npm","start"]
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "dockerfile"
+      });
+    </script>
+
+    <p>Dockerfile syntac highlighting for CodeMirror.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-dockerfile</code></p>
+  </article>

From efbd453ac1f1859bf012d776484092f1aae45f2f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:44:32 +0100
Subject: [PATCH 48/71] [dockerfile mode] Integrate

Issue #2888
---
 doc/compress.html             |  1 +
 mode/dockerfile/dockerfile.js | 13 +------------
 mode/index.html               |  1 +
 mode/meta.js                  |  1 +
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 4581fc4657..9df32f200f 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -106,6 +106,7 @@
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/django/django.js">django.js</option>
+          <option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 9444878699..bef67696bc 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -61,23 +61,12 @@
         // Match everything except for the inline comment
         regex: /[^#]+/,
         token: null,
-        next: "lineComment"
-      },
-      {
-        regex: /$/,
-        token: null,
         next: "start"
       },
-      // Fail safe return to start
       {
+        regex: /$/,
         token: null,
         next: "start"
-      }
-    ],
-    lineComment: [
-      {
-        regex: /#.*$/,
-        token: "comment"
       },
       // Fail safe return to start
       {
diff --git a/mode/index.html b/mode/index.html
index bb656d2a79..c346525f88 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -42,6 +42,7 @@
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
       <li><a href="django/index.html">Django</a> (templating language)</li>
+      <li><a href="dockerfile/index.html">Dockerfile</a></li>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="dylan/index.html">Dylan</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 94acac76da..d68b207902 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -28,6 +28,7 @@
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
     {name: "Django", mime: "text/x-django", mode: "django"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},

From a6cbaff2d0f1cd13d95f79d96e2d82c7044d5d55 Mon Sep 17 00:00:00 2001
From: Luke Stagner <lstagner@uci.edu>
Date: Sun, 9 Nov 2014 17:59:33 -0800
Subject: [PATCH 49/71] [idl mode] Add

---
 doc/compress.html   |   1 +
 mode/idl/idl.js     | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mode/idl/index.html |  64 +++++++++++
 mode/index.html     |   1 +
 mode/meta.js        |   1 +
 5 files changed, 365 insertions(+)
 create mode 100644 mode/idl/idl.js
 create mode 100644 mode/idl/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 9df32f200f..a727e45328 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -124,6 +124,7 @@
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
           <option value="http://codemirror.net/mode/http/http.js">http.js</option>
+          <option value="http://codemirror.net/mode/idl/idl.js">idl.js</option>
           <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
diff --git a/mode/idl/idl.js b/mode/idl/idl.js
new file mode 100644
index 0000000000..239d3cbe8a
--- /dev/null
+++ b/mode/idl/idl.js
@@ -0,0 +1,298 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('idl', function() {
+  function wordRegexp(words) {
+    return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
+  };
+
+  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
+
+  var singleOperators = /[+\-*&=<>\/@#~$]/;
+  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
+
+  var builtins = wordRegexp([
+    'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
+    'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
+    'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
+    'arrow', 'ascii_template', 'asin', 'assoc', 'atan',
+    'axis', 'axis', 'bandpass_filter', 'bandreject_filter', 'barplot',
+    'bar_plot', 'beseli', 'beselj', 'beselk', 'besely',
+    'beta', 'biginteger', 'bilinear', 'bin_date', 'binary_template',
+    'bindgen', 'binomial', 'bit_ffs', 'bit_population', 'blas_axpy',
+    'blk_con', 'boolarr', 'boolean', 'boxplot', 'box_cursor',
+    'breakpoint', 'broyden', 'bubbleplot', 'butterworth', 'bytarr',
+    'byte', 'byteorder', 'bytscl', 'c_correlate', 'calendar',
+    'caldat', 'call_external', 'call_function', 'call_method',
+    'call_procedure', 'canny', 'catch', 'cd', 'cdf', 'ceil',
+    'chebyshev', 'check_math', 'chisqr_cvf', 'chisqr_pdf', 'choldc',
+    'cholsol', 'cindgen', 'cir_3pnt', 'clipboard', 'close',
+    'clust_wts', 'cluster', 'cluster_tree', 'cmyk_convert', 'code_coverage',
+    'color_convert', 'color_exchange', 'color_quan', 'color_range_map',
+    'colorbar', 'colorize_sample', 'colormap_applicable',
+    'colormap_gradient', 'colormap_rotation', 'colortable',
+    'comfit', 'command_line_args', 'common', 'compile_opt', 'complex',
+    'complexarr', 'complexround', 'compute_mesh_normals', 'cond', 'congrid',
+    'conj', 'constrained_min', 'contour', 'contour', 'convert_coord',
+    'convol', 'convol_fft', 'coord2to3', 'copy_lun', 'correlate',
+    'cos', 'cosh', 'cpu', 'cramer', 'createboxplotdata',
+    'create_cursor', 'create_struct', 'create_view', 'crossp', 'crvlength',
+    'ct_luminance', 'cti_test', 'cursor', 'curvefit', 'cv_coord',
+    'cvttobm', 'cw_animate', 'cw_animate_getp', 'cw_animate_load',
+    'cw_animate_run', 'cw_arcball', 'cw_bgroup', 'cw_clr_index',
+    'cw_colorsel', 'cw_defroi', 'cw_field', 'cw_filesel', 'cw_form',
+    'cw_fslider', 'cw_light_editor', 'cw_light_editor_get',
+    'cw_light_editor_set', 'cw_orient', 'cw_palette_editor',
+    'cw_palette_editor_get', 'cw_palette_editor_set', 'cw_pdmenu',
+    'cw_rgbslider', 'cw_tmpl', 'cw_zoom', 'db_exists',
+    'dblarr', 'dcindgen', 'dcomplex', 'dcomplexarr', 'define_key',
+    'define_msgblk', 'define_msgblk_from_file', 'defroi', 'defsysv',
+    'delvar', 'dendro_plot', 'dendrogram', 'deriv', 'derivsig',
+    'determ', 'device', 'dfpmin', 'diag_matrix', 'dialog_dbconnect',
+    'dialog_message', 'dialog_pickfile', 'dialog_printersetup',
+    'dialog_printjob', 'dialog_read_image',
+    'dialog_write_image', 'dictionary', 'digital_filter', 'dilate', 'dindgen',
+    'dissolve', 'dist', 'distance_measure', 'dlm_load', 'dlm_register',
+    'doc_library', 'double', 'draw_roi', 'edge_dog', 'efont',
+    'eigenql', 'eigenvec', 'ellipse', 'elmhes', 'emboss',
+    'empty', 'enable_sysrtn', 'eof', 'eos', 'erase',
+    'erf', 'erfc', 'erfcx', 'erode', 'errorplot',
+    'errplot', 'estimator_filter', 'execute', 'exit', 'exp',
+    'expand', 'expand_path', 'expint', 'extrac', 'extract_slice',
+    'f_cvf', 'f_pdf', 'factorial', 'fft', 'file_basename',
+    'file_chmod', 'file_copy', 'file_delete', 'file_dirname',
+    'file_expand_path', 'file_gunzip', 'file_gzip', 'file_info',
+    'file_lines', 'file_link', 'file_mkdir', 'file_move',
+    'file_poll_input', 'file_readlink', 'file_same',
+    'file_search', 'file_tar', 'file_test', 'file_untar', 'file_unzip',
+    'file_which', 'file_zip', 'filepath', 'findgen', 'finite',
+    'fix', 'flick', 'float', 'floor', 'flow3',
+    'fltarr', 'flush', 'format_axis_values', 'forward_function', 'free_lun',
+    'fstat', 'fulstr', 'funct', 'function', 'fv_test',
+    'fx_root', 'fz_roots', 'gamma', 'gamma_ct', 'gauss_cvf',
+    'gauss_pdf', 'gauss_smooth', 'gauss2dfit', 'gaussfit',
+    'gaussian_function', 'gaussint', 'get_drive_list', 'get_dxf_objects',
+    'get_kbrd', 'get_login_info',
+    'get_lun', 'get_screen_size', 'getenv', 'getwindows', 'greg2jul',
+    'grib', 'grid_input', 'grid_tps', 'grid3', 'griddata',
+    'gs_iter', 'h_eq_ct', 'h_eq_int', 'hanning', 'hash',
+    'hdf', 'hdf5', 'heap_free', 'heap_gc', 'heap_nosave',
+    'heap_refcount', 'heap_save', 'help', 'hilbert', 'hist_2d',
+    'hist_equal', 'histogram', 'hls', 'hough', 'hqr',
+    'hsv', 'i18n_multibytetoutf8',
+    'i18n_multibytetowidechar', 'i18n_utf8tomultibyte',
+    'i18n_widechartomultibyte',
+    'ibeta', 'icontour', 'iconvertcoord', 'idelete', 'identity',
+    'idl_base64', 'idl_container', 'idl_validname',
+    'idlexbr_assistant', 'idlitsys_createtool',
+    'idlunit', 'iellipse', 'igamma', 'igetcurrent', 'igetdata',
+    'igetid', 'igetproperty', 'iimage', 'image', 'image_cont',
+    'image_statistics', 'image_threshold', 'imaginary', 'imap', 'indgen',
+    'int_2d', 'int_3d', 'int_tabulated', 'intarr', 'interpol',
+    'interpolate', 'interval_volume', 'invert', 'ioctl', 'iopen',
+    'ir_filter', 'iplot', 'ipolygon', 'ipolyline', 'iputdata',
+    'iregister', 'ireset', 'iresolve', 'irotate', 'isa',
+    'isave', 'iscale', 'isetcurrent', 'isetproperty', 'ishft',
+    'isocontour', 'isosurface', 'isurface', 'itext', 'itranslate',
+    'ivector', 'ivolume', 'izoom', 'journal', 'json_parse',
+    'json_serialize', 'jul2greg', 'julday', 'keyword_set', 'krig2d',
+    'kurtosis', 'kw_test', 'l64indgen', 'la_choldc', 'la_cholmprove',
+    'la_cholsol', 'la_determ', 'la_eigenproblem', 'la_eigenql', 'la_eigenvec',
+    'la_elmhes', 'la_gm_linear_model', 'la_hqr', 'la_invert',
+    'la_least_square_equality', 'la_least_squares', 'la_linear_equation',
+    'la_ludc', 'la_lumprove', 'la_lusol',
+    'la_svd', 'la_tridc', 'la_trimprove', 'la_triql', 'la_trired',
+    'la_trisol', 'label_date', 'label_region', 'ladfit', 'laguerre',
+    'lambda', 'lambdap', 'lambertw', 'laplacian', 'least_squares_filter',
+    'leefilt', 'legend', 'legendre', 'linbcg', 'lindgen',
+    'linfit', 'linkimage', 'list', 'll_arc_distance', 'lmfit',
+    'lmgr', 'lngamma', 'lnp_test', 'loadct', 'locale_get',
+    'logical_and', 'logical_or', 'logical_true', 'lon64arr', 'lonarr',
+    'long', 'long64', 'lsode', 'lu_complex', 'ludc',
+    'lumprove', 'lusol', 'm_correlate', 'machar', 'make_array',
+    'make_dll', 'make_rt', 'map', 'mapcontinents', 'mapgrid',
+    'map_2points', 'map_continents', 'map_grid', 'map_image', 'map_patch',
+    'map_proj_forward', 'map_proj_image', 'map_proj_info',
+    'map_proj_init', 'map_proj_inverse',
+    'map_set', 'matrix_multiply', 'matrix_power', 'max', 'md_test',
+    'mean', 'meanabsdev', 'mean_filter', 'median', 'memory',
+    'mesh_clip', 'mesh_decimate', 'mesh_issolid',
+    'mesh_merge', 'mesh_numtriangles',
+    'mesh_obj', 'mesh_smooth', 'mesh_surfacearea',
+    'mesh_validate', 'mesh_volume',
+    'message', 'min', 'min_curve_surf', 'mk_html_help', 'modifyct',
+    'moment', 'morph_close', 'morph_distance',
+    'morph_gradient', 'morph_hitormiss',
+    'morph_open', 'morph_thin', 'morph_tophat', 'multi', 'n_elements',
+    'n_params', 'n_tags', 'ncdf', 'newton', 'noise_hurl',
+    'noise_pick', 'noise_scatter', 'noise_slur', 'norm', 'obj_class',
+    'obj_destroy', 'obj_hasmethod', 'obj_isa', 'obj_new', 'obj_valid',
+    'objarr', 'on_error', 'on_ioerror', 'online_help', 'openr',
+    'openu', 'openw', 'oplot', 'oploterr', 'orderedhash',
+    'p_correlate', 'parse_url', 'particle_trace', 'path_cache', 'path_sep',
+    'pcomp', 'plot', 'plot3d', 'plot', 'plot_3dbox',
+    'plot_field', 'ploterr', 'plots', 'polar_contour', 'polar_surface',
+    'polyfill', 'polyshade', 'pnt_line', 'point_lun', 'polarplot',
+    'poly', 'poly_2d', 'poly_area', 'poly_fit', 'polyfillv',
+    'polygon', 'polyline', 'polywarp', 'popd', 'powell',
+    'pref_commit', 'pref_get', 'pref_set', 'prewitt', 'primes',
+    'print', 'printf', 'printd', 'pro', 'product',
+    'profile', 'profiler', 'profiles', 'project_vol', 'ps_show_fonts',
+    'psafm', 'pseudo', 'ptr_free', 'ptr_new', 'ptr_valid',
+    'ptrarr', 'pushd', 'qgrid3', 'qhull', 'qromb',
+    'qromo', 'qsimp', 'query_*', 'query_ascii', 'query_bmp',
+    'query_csv', 'query_dicom', 'query_gif', 'query_image', 'query_jpeg',
+    'query_jpeg2000', 'query_mrsid', 'query_pict', 'query_png', 'query_ppm',
+    'query_srf', 'query_tiff', 'query_video', 'query_wav', 'r_correlate',
+    'r_test', 'radon', 'randomn', 'randomu', 'ranks',
+    'rdpix', 'read', 'readf', 'read_ascii', 'read_binary',
+    'read_bmp', 'read_csv', 'read_dicom', 'read_gif', 'read_image',
+    'read_interfile', 'read_jpeg', 'read_jpeg2000', 'read_mrsid', 'read_pict',
+    'read_png', 'read_ppm', 'read_spr', 'read_srf', 'read_sylk',
+    'read_tiff', 'read_video', 'read_wav', 'read_wave', 'read_x11_bitmap',
+    'read_xwd', 'reads', 'readu', 'real_part', 'rebin',
+    'recall_commands', 'recon3', 'reduce_colors', 'reform', 'region_grow',
+    'register_cursor', 'regress', 'replicate',
+    'replicate_inplace', 'resolve_all',
+    'resolve_routine', 'restore', 'retall', 'return', 'reverse',
+    'rk4', 'roberts', 'rot', 'rotate', 'round',
+    'routine_filepath', 'routine_info', 'rs_test', 's_test', 'save',
+    'savgol', 'scale3', 'scale3d', 'scatterplot', 'scatterplot3d',
+    'scope_level', 'scope_traceback', 'scope_varfetch',
+    'scope_varname', 'search2d',
+    'search3d', 'sem_create', 'sem_delete', 'sem_lock', 'sem_release',
+    'set_plot', 'set_shading', 'setenv', 'sfit', 'shade_surf',
+    'shade_surf_irr', 'shade_volume', 'shift', 'shift_diff', 'shmdebug',
+    'shmmap', 'shmunmap', 'shmvar', 'show3', 'showfont',
+    'signum', 'simplex', 'sin', 'sindgen', 'sinh',
+    'size', 'skewness', 'skip_lun', 'slicer3', 'slide_image',
+    'smooth', 'sobel', 'socket', 'sort', 'spawn',
+    'sph_4pnt', 'sph_scat', 'spher_harm', 'spl_init', 'spl_interp',
+    'spline', 'spline_p', 'sprsab', 'sprsax', 'sprsin',
+    'sprstp', 'sqrt', 'standardize', 'stddev', 'stop',
+    'strarr', 'strcmp', 'strcompress', 'streamline', 'streamline',
+    'stregex', 'stretch', 'string', 'strjoin', 'strlen',
+    'strlowcase', 'strmatch', 'strmessage', 'strmid', 'strpos',
+    'strput', 'strsplit', 'strtrim', 'struct_assign', 'struct_hide',
+    'strupcase', 'surface', 'surface', 'surfr', 'svdc',
+    'svdfit', 'svsol', 'swap_endian', 'swap_endian_inplace', 'symbol',
+    'systime', 't_cvf', 't_pdf', 't3d', 'tag_names',
+    'tan', 'tanh', 'tek_color', 'temporary', 'terminal_size',
+    'tetra_clip', 'tetra_surface', 'tetra_volume', 'text', 'thin',
+    'thread', 'threed', 'tic', 'time_test2', 'timegen',
+    'timer', 'timestamp', 'timestamptovalues', 'tm_test', 'toc',
+    'total', 'trace', 'transpose', 'tri_surf', 'triangulate',
+    'trigrid', 'triql', 'trired', 'trisol', 'truncate_lun',
+    'ts_coef', 'ts_diff', 'ts_fcast', 'ts_smooth', 'tv',
+    'tvcrs', 'tvlct', 'tvrd', 'tvscl', 'typename',
+    'uindgen', 'uint', 'uintarr', 'ul64indgen', 'ulindgen',
+    'ulon64arr', 'ulonarr', 'ulong', 'ulong64', 'uniq',
+    'unsharp_mask', 'usersym', 'value_locate', 'variance', 'vector',
+    'vector_field', 'vel', 'velovect', 'vert_t3d', 'voigt',
+    'volume', 'voronoi', 'voxel_proj', 'wait', 'warp_tri',
+    'watershed', 'wdelete', 'wf_draw', 'where', 'widget_base',
+    'widget_button', 'widget_combobox', 'widget_control',
+    'widget_displaycontextmenu', 'widget_draw',
+    'widget_droplist', 'widget_event', 'widget_info',
+    'widget_label', 'widget_list',
+    'widget_propertysheet', 'widget_slider', 'widget_tab',
+    'widget_table', 'widget_text',
+    'widget_tree', 'widget_tree_move', 'widget_window',
+    'wiener_filter', 'window',
+    'window', 'write_bmp', 'write_csv', 'write_gif', 'write_image',
+    'write_jpeg', 'write_jpeg2000', 'write_nrif', 'write_pict', 'write_png',
+    'write_ppm', 'write_spr', 'write_srf', 'write_sylk', 'write_tiff',
+    'write_video', 'write_wav', 'write_wave', 'writeu', 'wset',
+    'wshow', 'wtn', 'wv_applet', 'wv_cwt', 'wv_cw_wavelet',
+    'wv_denoise', 'wv_dwt', 'wv_fn_coiflet',
+    'wv_fn_daubechies', 'wv_fn_gaussian',
+    'wv_fn_haar', 'wv_fn_morlet', 'wv_fn_paul',
+    'wv_fn_symlet', 'wv_import_data',
+    'wv_import_wavelet', 'wv_plot3d_wps', 'wv_plot_multires',
+    'wv_pwt', 'wv_tool_denoise',
+    'xbm_edit', 'xdisplayfile', 'xdxf', 'xfont', 'xinteranimate',
+    'xloadct', 'xmanager', 'xmng_tmpl', 'xmtool', 'xobjview',
+    'xobjview_rotate', 'xobjview_write_image',
+    'xpalette', 'xpcolor', 'xplot3d',
+    'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
+    'xvolume', 'xvolume_rotate', 'xvolume_write_image',
+    'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
+  ]);
+
+  var keywords = wordRegexp([
+    'begin', 'end', 'endcase', 'endfor',
+    'endwhile', 'endif', 'endrep', 'endforeach',
+    'break', 'case', 'continue', 'for',
+    'foreach', 'goto', 'if', 'then', 'else',
+    'repeat', 'until', 'switch', 'while',
+    'do', 'pro', 'function'
+  ]);
+
+  function tokenBase(stream, _state) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match(';')) {
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/)) {
+        stream.tokenize = tokenBase;
+        return 'number'; }
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/)) {
+        return 'number'; }
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/)) { return 'number'; }
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; }
+    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; }
+
+    // Handle words
+    if (stream.match(keywords)) { return 'keyword'; }
+    if (stream.match(builtins)) { return 'builtin'; }
+    if (stream.match(identifiers)) { return 'variable'; }
+
+    if (stream.match(singleOperators) || stream.match(boolOperators)) {
+      return 'operator'; }
+
+    // Handle non-detected items
+    stream.next();
+    return 'error';
+  };
+
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream,  state) {
+      var style = state.tokenize(stream, state);
+      if (style === 'comment' || style === 'meta') {
+        return style;
+      }
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-idl', 'idl');
+
+});
diff --git a/mode/idl/index.html b/mode/idl/index.html
new file mode 100644
index 0000000000..4c169e2d69
--- /dev/null
+++ b/mode/idl/index.html
@@ -0,0 +1,64 @@
+<!doctype html>
+
+<title>CodeMirror: IDL mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="idl.js"></script>
+<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">IDL</a>
+  </ul>
+</div>
+
+<article>
+<h2>IDL mode</h2>
+
+    <div><textarea id="code" name="code">
+;; Example IDL code
+FUNCTION mean_and_stddev,array
+  ;; This program reads in an array of numbers
+  ;; and returns a structure containing the
+  ;; average and standard deviation
+
+  ave = 0.0
+  count = 0.0
+
+  for i=0,N_ELEMENTS(array)-1 do begin
+      ave = ave + array[i]
+      count = count + 1
+  endfor
+  
+  ave = ave/count
+
+  std = stddev(array)  
+
+  return, {average:ave,std:std}
+
+END
+
+    </textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "idl",
+               version: 1,
+               singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 4,
+        matchBrackets: true
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-idl</code>.</p>
+</article>
diff --git a/mode/index.html b/mode/index.html
index c346525f88..576da6f1c3 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -61,6 +61,7 @@
       <li><a href="htmlembedded/index.html">HTML embedded scripts</a></li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="http/index.html">HTTP</a></li>
+      <li><a href="idl/index.html">IDL</a></li>
       <li><a href="clike/index.html">Java</a></li>
       <li><a href="jade/index.html">Jade</a></li>
       <li><a href="javascript/index.html">JavaScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index d68b207902..7d28b8b917 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -49,6 +49,7 @@
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
     {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
     {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
     {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
     {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},

From 986e319ad6c885a3652503d9f5b6e1aee32cba7a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:51:50 +0100
Subject: [PATCH 50/71] [idl mode] Simplify and add hintWords support

Issue #2921
---
 mode/idl/idl.js | 64 +++++++++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 239d3cbe8a..15c852e36c 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -9,19 +9,13 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
+  "use strict";
 
-CodeMirror.defineMode('idl', function() {
   function wordRegexp(words) {
     return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
   };
 
-  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
-
-  var singleOperators = /[+\-*&=<>\/@#~$]/;
-  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
-
-  var builtins = wordRegexp([
+  var builtinArray = [
     'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
     'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
     'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
@@ -227,18 +221,27 @@ CodeMirror.defineMode('idl', function() {
     'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
     'xvolume', 'xvolume_rotate', 'xvolume_write_image',
     'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
-  ]);
+  ];
+  var builtins = wordRegexp(builtinArray);
 
-  var keywords = wordRegexp([
+  var keywordArray = [
     'begin', 'end', 'endcase', 'endfor',
     'endwhile', 'endif', 'endrep', 'endforeach',
     'break', 'case', 'continue', 'for',
     'foreach', 'goto', 'if', 'then', 'else',
     'repeat', 'until', 'switch', 'while',
     'do', 'pro', 'function'
-  ]);
+  ];
+  var keywords = wordRegexp(keywordArray);
 
-  function tokenBase(stream, _state) {
+  CodeMirror.registerHelper("hintWords", "idl", builtinArray.concat(keywordArray));
+
+  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
+
+  var singleOperators = /[+\-*&=<>\/@#~$]/;
+  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
+
+  function tokenBase(stream) {
     // whitespaces
     if (stream.eatSpace()) return null;
 
@@ -250,12 +253,12 @@ CodeMirror.defineMode('idl', function() {
 
     // Handle Number Literals
     if (stream.match(/^[0-9\.+-]/, false)) {
-      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/)) {
-        stream.tokenize = tokenBase;
-        return 'number'; }
-      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/)) {
-        return 'number'; }
-      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/)) { return 'number'; }
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return 'number';
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return 'number';
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return 'number';
     }
 
     // Handle Strings
@@ -275,24 +278,13 @@ CodeMirror.defineMode('idl', function() {
     return 'error';
   };
 
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase
-      };
-    },
-
-    token: function(stream,  state) {
-      var style = state.tokenize(stream, state);
-      if (style === 'comment' || style === 'meta') {
-        return style;
+  CodeMirror.defineMode('idl', function() {
+    return {
+      token: function(stream) {
+        return tokenBase(stream);
       }
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-idl', 'idl');
+    };
+  });
 
+  CodeMirror.defineMIME('text/x-idl', 'idl');
 });

From a9ee60558df3ff8979b48f96ab91127a1b6ae3f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 21:15:32 +0100
Subject: [PATCH 51/71] [vim mode] Remove duplicated statement

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 66f2077674..c0bd416c16 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -282,7 +282,6 @@
       CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       cm.on('keypress', handleKeyPress);
       cm.on('keydown', handleKeyDown);
-      CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
     }
 
     function leaveVimMode(cm) {

From c2306eddea6131ea4910a901206bde03c659c9f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 22:11:28 +0100
Subject: [PATCH 52/71] [css mode] Slightly better heuristic for unrecognized
 props in nested declarations

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 2695d08150..55082bf8e4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -182,7 +182,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "string-2";
         return "maybeprop";
       } else if (allowNested) {
-        override = stream.match(/^\s*:/, false) ? "property" : "tag";
+        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
         return "block";
       } else {
         override += " error";

From c47adcc98a87396224d90a31101fa32ed2c8939d Mon Sep 17 00:00:00 2001
From: Jared Forsyth <jabapyth@gmail.com>
Date: Tue, 11 Nov 2014 10:07:00 -0700
Subject: [PATCH 53/71] [javascript-hint addon] Allow a custom global scope

Defaults to `window`
---
 addon/hint/javascript-hint.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index c7292468a0..f6c2440062 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -93,7 +93,7 @@
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 
   function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string;
+    var found = [], start = token.string, global = options && options.globalScope || window;
     function maybeAdd(str) {
       if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
@@ -112,28 +112,28 @@
         if (options && options.additionalContext)
           base = options.additionalContext[obj.string];
         if (!options || options.useGlobalScope !== false)
-          base = base || window[obj.string];
+          base = base || global[obj.string];
       } else if (obj.type == "string") {
         base = "";
       } else if (obj.type == "atom") {
         base = 1;
       } else if (obj.type == "function") {
-        if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof window.jQuery == 'function'))
-          base = window.jQuery();
-        else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function'))
-          base = window._();
+        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
+            (typeof global.jQuery == 'function'))
+          base = global.jQuery();
+        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
+          base = global._();
       }
       while (base != null && context.length)
         base = base[context.pop().string];
       if (base != null) gatherCompletions(base);
     } else {
-      // If not, just look in the window object and any local scope
+      // If not, just look in the global object and any local scope
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
       if (!options || options.useGlobalScope !== false)
-        gatherCompletions(window);
+        gatherCompletions(global);
       forEach(keywords, maybeAdd);
     }
     return found;

From e9d3c124ed8c707f4c26098a73486ad4770ce1fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 23:17:03 +0100
Subject: [PATCH 54/71] Fix association of modes with tokens for addModeClass

The mode associated with a token is now the inner mode at
the time when the token is started. The htmlmixed and markdown/gfm
modes were fixed to return empty tokens during mode switches
when necessary to enforce this rule.

Issue #2919
---
 lib/codemirror.js           | 10 ++++++----
 mode/htmlmixed/htmlmixed.js |  4 ++--
 mode/markdown/markdown.js   | 26 +++++++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 05795e244f..c7fdf633c3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5840,8 +5840,9 @@
     if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
   }
 
-  function readToken(mode, stream, state) {
+  function readToken(mode, stream, state, inner) {
     for (var i = 0; i < 10; i++) {
+      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
       var style = mode.token(stream, state);
       if (stream.pos > stream.start) return style;
     }
@@ -5876,6 +5877,7 @@
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
     var curStart = 0, curStyle = null;
     var stream = new StringStream(text, cm.options.tabSize), style;
+    var inner = cm.options.addModeClass && [null];
     if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
@@ -5884,10 +5886,10 @@
         stream.pos = text.length;
         style = null;
       } else {
-        style = extractLineClasses(readToken(mode, stream, state), lineClasses);
+        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
       }
-      if (cm.options.addModeClass) {
-        var mName = CodeMirror.innerMode(mode, state).mode.name;
+      if (inner) {
+        var mName = inner[0].name;
         if (mName) style = "m-" + (style ? mName + " " + style : mName);
       }
       if (!flattenSpans || curStyle != style) {
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 250ef8cd24..1cc438f013 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -69,7 +69,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*script\s*>/i, false)) {
       state.token = html;
       state.localState = state.localMode = null;
-      return html(stream, state);
+      return null;
     }
     return maybeBackup(stream, /<\/\s*script\s*>/,
                        state.localMode.token(stream, state.localState));
@@ -78,7 +78,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*style\s*>/i, false)) {
       state.token = html;
       state.localState = state.localMode = null;
-      return html(stream, state);
+      return null;
     }
     return maybeBackup(stream, /<\/\s*style\s*>/,
                        cssMode.token(stream, state.localState));
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d64bfdb6b0..7c87984e2b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -199,15 +199,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (stream.sol() && stream.match(/^```/, true)) {
+    if (stream.sol() && stream.match("```", false)) {
       state.localMode = state.localState = null;
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      state.code = true;
-      var returnType = getType(state);
-      state.code = false;
-      return returnType;
+      state.f = state.block = leavingLocal;
+      return null;
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {
@@ -216,6 +211,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
   }
 
+  function leavingLocal(stream, state) {
+    stream.match("```");
+    state.block = blockNormal;
+    state.f = inlineNormal;
+    if (modeCfg.highlightFormatting) state.formatting = "code-block";
+    state.code = true;
+    var returnType = getType(state);
+    state.code = false;
+    return returnType;
+  }
+
   // Inline
   function getType(state) {
     var styles = [];
@@ -736,9 +742,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.indentation = adjustedIndentation;
         if (indentation > 0) return null;
       }
-      var result = state.f(stream, state);
-      if (stream.start == stream.pos) return this.token(stream, state);
-      else return result;
+      return state.f(stream, state);
     },
 
     innerMode: function(state) {

From 36eb2c5ac334aadf250fbdb6d536ec28960748ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 00:31:43 +0100
Subject: [PATCH 55/71] [overlay addon] Fix bad synchronization that was
 breaking gfm mode

Issue #2919
---
 addon/mode/overlay.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 393054dfa4..e1b9ed3753 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -28,7 +28,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
         overlay: CodeMirror.startState(overlay),
         basePos: 0, baseCur: null,
         overlayPos: 0, overlayCur: null,
-        lineSeen: null
+        streamSeen: null
       };
     },
     copyState: function(state) {
@@ -41,9 +41,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
     },
 
     token: function(stream, state) {
-      if (stream.sol() || stream.string != state.lineSeen ||
+      if (stream != state.streamSeen ||
           Math.min(state.basePos, state.overlayPos) < stream.start) {
-        state.lineSeen = stream.string;
+        state.streamSeen = stream;
         state.basePos = state.overlayPos = stream.start;
       }
 

From 2024a3fcc8031b1121eab71dd02d14e21aa2c415 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 10:21:19 +0100
Subject: [PATCH 56/71] [ruby mode] Remove obsolete license link

---
 mode/ruby/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 1197ab023f..97544babc3 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -178,7 +178,6 @@
     <p><strong>MIME types defined:</strong> <code>text/x-ruby</code>.</p>
 
     <p>Development of the CodeMirror Ruby mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>, who hold
-    the <a href="LICENSE">license</a>.</p>
+    by <a href="http://ubalo.com/">Ubalo</a>.</p>
 
   </article>

From 357485bb35156fc5ad739209998253f5d6b31b26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 12:04:29 +0100
Subject: [PATCH 57/71] Allow keymaps to have a call property, which is called
 to look up bindings

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7fdf633c3..4b6b8a8dbf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4953,7 +4953,7 @@
 
   var lookupKey = CodeMirror.lookupKey = function(key, map, handle) {
     map = getKeyMap(map);
-    var found = map[key];
+    var found = map.call ? map.call(key) : map[key];
     if (found === false) return "nothing";
     if (found === "...") return "multi";
     if (found != null && handle(found)) return "handled";

From 199c90e51addd896768661e89ef31fa729a760fe Mon Sep 17 00:00:00 2001
From: Gregory Koberger <gkoberger@gmail.com>
Date: Sat, 8 Nov 2014 22:48:45 -0800
Subject: [PATCH 58/71] [clike mode] Add Objective-C Support

---
 mode/clike/clike.js   | 20 ++++++++++++++++++++
 mode/clike/index.html | 26 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0f24bb8497..cce41a470c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -471,4 +471,24 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-objectivec", {
+    name: "clike",
+    keywords: words("IBAction IBOutlet readwrite readonly nonatomic SEL" +
+                    "super self copy if else for in enum while typedef switch case return " +
+                    "const static retain"),
+    builtin: words("char bool BOOL double float int long short id void"),
+    atoms: words("YES NO NULL NILL ON OFF"),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "keyword";
+      },
+      "#": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "keyword";
+      }
+    },
+    modeProps: {fold: ["brace", "import"]}
+  });
+
 });
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 639ac39860..8b386d22e0 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -139,6 +139,26 @@
 }
 </textarea></div>
 
+<h2>Objective-C example</h2>
+
+<div><textarea id="objectivec-code">
+/*
+This is a longer comment
+That spans two lines
+*/
+
+#import <Test/Test.h>
+@implementation YourAppDelegate
+
+// This is a one-line comment
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+  char myString[] = "This is a C character array";
+  int test = 5;
+  return YES;
+}
+</textarea></div>
+
 <h2>Java example</h2>
 
 <div><textarea id="java-code">
@@ -202,6 +222,11 @@
         matchBrackets: true,
         mode: "text/x-java"
       });
+      var objectivecEditor = CodeMirror.fromTextArea(document.getElementById("objectivec-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-objectivec"
+      });
       var scalaEditor = CodeMirror.fromTextArea(document.getElementById("scala-code"), {
         lineNumbers: true,
         matchBrackets: true,
@@ -220,6 +245,7 @@
     <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
     (C), <code>text/x-c++src</code> (C++), <code>text/x-java</code>
     (Java), <code>text/x-csharp</code> (C#),
+    <code>text/x-objectivec</code> (Objective-C),
     <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
     and <code>x-shader/x-fragment</code> (shader programs).</p>
 </article>

From 97f606494fb7fe48a2cced689864a3566d43bb16 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 12:33:18 +0100
Subject: [PATCH 59/71] [clike mode] Integrate Objective C dialect

Issue #2920
---
 mode/clike/clike.js | 15 +++++----------
 mode/index.html     |  1 +
 mode/meta.js        |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index cce41a470c..710953b229 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -473,22 +473,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words("IBAction IBOutlet readwrite readonly nonatomic SEL" +
-                    "super self copy if else for in enum while typedef switch case return " +
-                    "const static retain"),
-    builtin: words("char bool BOOL double float int long short id void"),
+    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
+                    "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
     atoms: words("YES NO NULL NILL ON OFF"),
     hooks: {
       "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
+        stream.eatWhile(/[\w\$]/);
         return "keyword";
       },
-      "#": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "keyword";
-      }
+      "#": cppHook
     },
-    modeProps: {fold: ["brace", "import"]}
+    modeProps: {fold: "brace"}
   });
 
 });
diff --git a/mode/index.html b/mode/index.html
index 576da6f1c3..82bf03ae51 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -76,6 +76,7 @@
       <li><a href="modelica/index.html">Modelica</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
+      <li><a href="clike/index.html">Objective C</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
       <li><a href="pascal/index.html">Pascal</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 7d28b8b917..94cf192976 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -71,6 +71,7 @@
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},

From 8d159b6ed01516c365e1bb4fa93b0fa2f1d38fd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 14:04:15 +0100
Subject: [PATCH 60/71] Allow styling of line gutter backgrounds

Also add support for "gutter" in add/removeLineClass.
---
 doc/manual.html    |  9 +++++----
 lib/codemirror.css |  5 +++++
 lib/codemirror.js  | 23 +++++++++++++++--------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 736be44d5f..8183fb1b84 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1639,10 +1639,11 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       to which element this class should be applied, can can be one
       of <code>"text"</code> (the text element, which lies in front of
       the selection), <code>"background"</code> (a background element
-      that will be behind the selection), or <code>"wrap"</code> (the
-      wrapper node that wraps all of the line's elements, including
-      gutter elements). <code>class</code> should be the name of the
-      class to apply.</dd>
+      that will be behind the selection), <code>"gutter"</code> (the
+      line's gutter space), or <code>"wrap"</code> (the wrapper node
+      that wraps all of the line's elements, including gutter
+      elements). <code>class</code> should be the name of the class to
+      apply.</dd>
 
       <dt id="removeLineClass"><code><strong>doc.removeLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
       <dd>Remove a CSS class from a line. <code>line</code> can be a
diff --git a/lib/codemirror.css b/lib/codemirror.css
index eba9a5d8b5..e2d4ec2048 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -210,6 +210,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   *zoom:1;
   *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  height: 100%;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b6b8a8dbf..01d37002a9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -867,9 +867,12 @@
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
       var gutterWrap = lineView.gutter =
-        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
-                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
+        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                              "px; width: " + dims.gutterTotalWidth + "px"),
                           lineView.text);
+      if (lineView.line.gutterClass)
+        gutterWrap.className += " " + lineView.line.gutterClass;
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
         lineView.lineNumber = gutterWrap.appendChild(
           elt("div", lineNumberFor(cm.options, lineN),
@@ -6608,22 +6611,26 @@
     },
 
     addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
+        else if (classTest(cls).test(line[prop])) return false;
         else line[prop] += " " + cls;
         return true;
       });
     }),
     removeLineClass: docMethodOp(function(handle, where, cls) {
       return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
         var cur = line[prop];
         if (!cur) return false;
         else if (cls == null) line[prop] = null;
         else {
-          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
+          var found = cur.match(classTest(cls));
           if (!found) return false;
           var end = found.index + found[0].length;
           line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
@@ -7449,7 +7456,7 @@
     catch(e) { return document.body; }
   };
 
-  function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
+  function classTest(cls) { return new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)\\s*"); }
   var rmClass = CodeMirror.rmClass = function(node, cls) {
     var test = classTest(cls);
     if (test.test(node.className)) node.className = node.className.replace(test, "");

From fc54c026d2ced8d3e7deb866455ca79b764adb9c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Nov 2014 21:28:19 +0100
Subject: [PATCH 61/71] Suppress error in IE8/9 when initializing detached

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 01d37002a9..ad8e98ac82 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7424,7 +7424,8 @@
   };
   else range = function(node, start, end) {
     var r = document.body.createTextRange();
-    r.moveToElementText(node.parentNode);
+    try { r.moveToElementText(node.parentNode); }
+    catch(e) { return r; }
     r.collapse(true);
     r.moveEnd("character", end);
     r.moveStart("character", start);

From 4bce53423da19c95ab1420885497f19e3ace5db1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Nov 2014 22:29:04 +0100
Subject: [PATCH 62/71] Fix rmClass

Add tests
---
 lib/codemirror.js | 13 +++++++++----
 test/test.js      | 29 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad8e98ac82..9dc7b27e08 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7457,13 +7457,18 @@
     catch(e) { return document.body; }
   };
 
-  function classTest(cls) { return new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
   var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var test = classTest(cls);
-    if (test.test(node.className)) node.className = node.className.replace(test, "");
+    var current = node.className;
+    var match = classTest(cls).exec(current);
+    if (match) {
+      var after = current.slice(match.index + match[0].length);
+      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    }
   };
   var addClass = CodeMirror.addClass = function(node, cls) {
-    if (!classTest(cls).test(node.className)) node.className += " " + cls;
+    var current = node.className;
+    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
   };
   function joinClasses(a, b) {
     var as = a.split(" ");
diff --git a/test/test.js b/test/test.js
index e437c589f6..3a19c8f5af 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2044,3 +2044,32 @@ testCM("eventOrder", function(cm) {
   cm.replaceSelection("/");
   eq(seen.join(","), "change,change,activity,change");
 });
+
+test("core_rmClass", function() {
+  var node = document.createElement("div");
+  node.className = "foo-bar baz-quux yadda";
+  CodeMirror.rmClass(node, "quux");
+  eq(node.className, "foo-bar baz-quux yadda");
+  CodeMirror.rmClass(node, "baz-quux");
+  eq(node.className, "foo-bar yadda");
+  CodeMirror.rmClass(node, "yadda");
+  eq(node.className, "foo-bar");
+  CodeMirror.rmClass(node, "foo-bar");
+  eq(node.className, "");
+  node.className = " foo ";
+  CodeMirror.rmClass(node, "foo");
+  eq(node.className, "");
+});
+
+test("core_addClass", function() {
+  var node = document.createElement("div");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+  CodeMirror.addClass(node, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+});

From c78d76c829b770aed68c71383960a7b6195e831b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 9 Nov 2014 14:47:46 -0500
Subject: [PATCH 63/71] [vim] Visual mode rewrite

I'm rewriting the way that visual mode is written to:
1. Fix some tricky bugs, like https://github.com/codemirror/CodeMirror/issues/2913, and a couple I uncovered while doing this. (Unit tests updated)
2. Significantly simplify blockwise visual mode

The core of the changes here is that I'm creating a vim selection model. The selection model consists of

```
vim.sel.head
vim.sel.anchor
vim.visualMode
vim.visualLine
vim.visualBlock
```

I'm creating a 2-way binding between the vim and codemirror selection models. All motions now rely only on the vim selection model. Operators and actions still rely on the codemirror selection model, since they operate directly on the text.

Sorry for the gigantic change but I couldn't make it any smaller and still pass all the tests... I'm planning to delete `getSelectedAreaRange`, `getLastSelectedAreaRange`, and `selectBlock` in future changes as they are obsolete now that vim keeps its own selection model.

An added bonus here is that visual line mode now has a cursor that can be moved.
---
 keymap/vim.js    | 1065 +++++++++++++++++++++++++++---------------------------
 test/vim_test.js |  109 +++++-
 2 files changed, 613 insertions(+), 561 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c0bd416c16..c5b945cd67 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -164,10 +164,14 @@
     // Operator-Motion dual commands
     { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
     { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: '~', type: 'operatorMotion', operator: 'changeCase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
+    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
@@ -178,7 +182,8 @@
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
     { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank' }},
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
     { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
     { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
     { keys: 'v', type: 'action', action: 'toggleVisualMode' },
@@ -556,7 +561,9 @@
           visualLine: false,
           visualBlock: false,
           lastSelection: null,
-          lastPastedText: null
+          lastPastedText: null,
+          sel: {
+          }
         };
       }
       return cm.state.vim;
@@ -735,6 +742,7 @@
           } catch (e) {
             // clear VIM state in case it's in a bad state.
             cm.state.vim = undefined;
+            maybeInitVimState(cm);
             throw e;
           }
         });
@@ -1238,13 +1246,13 @@
         var operator = inputState.operator;
         var operatorArgs = inputState.operatorArgs || {};
         var registerName = inputState.registerName;
-        var selectionEnd = copyCursor(cm.getCursor('head'));
-        var selectionStart = copyCursor(cm.getCursor('anchor'));
-        // The difference between cur and selection cursors are that cur is
-        // being operated on and ignores that there is a selection.
-        var curStart = copyCursor(selectionEnd);
-        var curOriginal = copyCursor(curStart);
-        var curEnd;
+        var sel = vim.sel;
+        // TODO: Make sure cm and vim selections are identical outside visual mode.
+        var origHead = copyCursor(vim.visualMode ? sel.head: cm.getCursor('head'));
+        var origAnchor = copyCursor(vim.visualMode ? sel.anchor : cm.getCursor('anchor'));
+        var oldHead = copyCursor(origHead);
+        var oldAnchor = copyCursor(origAnchor);
+        var newHead, newAnchor;
         var repeat;
         if (operator) {
           this.recordLastEdit(vim, inputState);
@@ -1271,7 +1279,7 @@
         motionArgs.repeat = repeat;
         clearInputState(cm);
         if (motion) {
-          var motionResult = motions[motion](cm, motionArgs, vim);
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
           vim.lastMotion = motions[motion];
           if (!motionResult) {
             return;
@@ -1284,159 +1292,139 @@
               recordJumpPosition(cm, cachedCursor, motionResult);
               delete jumpList.cachedCursor;
             } else {
-              recordJumpPosition(cm, curOriginal, motionResult);
+              recordJumpPosition(cm, origHead, motionResult);
             }
           }
           if (motionResult instanceof Array) {
-            curStart = motionResult[0];
-            curEnd = motionResult[1];
+            newAnchor = motionResult[0];
+            newHead = motionResult[1];
           } else {
-            curEnd = motionResult;
+            newHead = motionResult;
           }
           // TODO: Handle null returns from motion commands better.
-          if (!curEnd) {
-            curEnd = Pos(curStart.line, curStart.ch);
+          if (!newHead) {
+            newHead = copyCursor(origHead);
           }
           if (vim.visualMode) {
-            // Check if the selection crossed over itself. Will need to shift
-            // the start point if that happened.
-            // offset is set to -1 or 1 to shift the curEnd
-            // left or right
-            var offset = 0;
-            if (cursorIsBefore(selectionStart, selectionEnd) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(curEnd, selectionStart))) {
-              // The end of the selection has moved from after the start to
-              // before the start. We will shift the start right by 1.
-              selectionStart.ch += 1;
-              offset = -1;
-            } else if (cursorIsBefore(selectionEnd, selectionStart) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(selectionStart, curEnd))) {
-              // The opposite happened. We will shift the start left by 1.
-              selectionStart.ch -= 1;
-              offset = 1;
-            }
-            // in case of visual Block selectionStart and curEnd
-            // may not be on the same line,
-            // Also, In case of v_o this should not happen.
-            if (!vim.visualBlock && !(motionResult instanceof Array)) {
-              curEnd.ch += offset;
-            }
-            if (vim.lastHPos != Infinity) {
-              vim.lastHPos = curEnd.ch;
-            }
-            selectionEnd = curEnd;
-            selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
-            if (vim.visualLine) {
-              if (cursorIsBefore(selectionStart, selectionEnd)) {
-                selectionStart.ch = 0;
-
-                var lastLine = cm.lastLine();
-                if (selectionEnd.line > lastLine) {
-                  selectionEnd.line = lastLine;
-                }
-                selectionEnd.ch = lineLength(cm, selectionEnd.line);
-              } else {
-                selectionEnd.ch = 0;
-                selectionStart.ch = lineLength(cm, selectionStart.line);
-              }
-            } else if (vim.visualBlock) {
-              // Select a block and
-              // return the diagonally opposite end.
-              selectionStart = selectBlock(cm, selectionEnd);
-            }
-            if (!vim.visualBlock) {
-              cm.setSelection(selectionStart, selectionEnd);
+            newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            if (newAnchor) {
+              newAnchor = clipCursorToContent(cm, newAnchor, true);
             }
+            newAnchor = newAnchor || oldAnchor;
+            sel.anchor = newAnchor;
+            sel.head = newHead;
+            updateCmSelection(cm);
             updateMark(cm, vim, '<',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-                    : selectionEnd);
+                cursorIsBefore(newAnchor, newHead) ? newAnchor
+                    : newHead);
             updateMark(cm, vim, '>',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-                    : selectionStart);
+                cursorIsBefore(newAnchor, newHead) ? newHead
+                    : newAnchor);
           } else if (!operator) {
-            curEnd = clipCursorToContent(cm, curEnd);
-            cm.setCursor(curEnd.line, curEnd.ch);
+            newHead = clipCursorToContent(cm, newHead);
+            cm.setCursor(newHead.line, newHead.ch);
           }
         }
-
         if (operator) {
-          var inverted = false;
-          vim.lastMotion = null;
-          var lastSelection = vim.lastSelection;
-          operatorArgs.repeat = repeat; // Indent in visual mode needs this.
-          if (vim.visualMode) {
-            curStart = selectionStart;
-            curEnd = selectionEnd;
-            motionArgs.inclusive = true;
-            operatorArgs.shouldMoveCursor = false;
-          }
-          // Swap start and end if motion was backward.
-          if (curEnd && cursorIsBefore(curEnd, curStart)) {
-            var tmp = curStart;
-            curStart = curEnd;
-            curEnd = tmp;
-            inverted = true;
-          } else if (!curEnd) {
-            curEnd = copyCursor(curStart);
-          }
-          if (motionArgs.inclusive && !vim.visualMode) {
-            // Move the selection end one to the right to include the last
-            // character.
-            curEnd.ch++;
-          }
-          if (operatorArgs.selOffset) {
+          if (operatorArgs.lastSel) {
             // Replaying a visual mode operation
-            curEnd.line = curStart.line + operatorArgs.selOffset.line;
-            if (operatorArgs.selOffset.line) {curEnd.ch = operatorArgs.selOffset.ch; }
-            else { curEnd.ch = curStart.ch + operatorArgs.selOffset.ch; }
-            // In case of blockwise visual
-            if (lastSelection && lastSelection.visualBlock) {
-              var block = lastSelection.visualBlock;
-              var width = block.width;
-              var height = block.height;
-              curEnd = Pos(curStart.line + height, curStart.ch + width);
-              // selectBlock creates a 'proper' rectangular block.
-              // We do not want that in all cases, so we manually set selections.
-              var selections = [];
-              for (var i = curStart.line; i < curEnd.line; i++) {
-                var anchor = Pos(i, curStart.ch);
-                var head = Pos(i, curEnd.ch);
-                var range = {anchor: anchor, head: head};
-                selections.push(range);
-              }
-              cm.setSelections(selections);
-              var blockSelected = true;
+            newAnchor = oldAnchor;
+            var lastSel = operatorArgs.lastSel;
+            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
+            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
+            if (lastSel.visualLine) {
+              // Linewise Visual mode: The same number of lines.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            } else if (lastSel.visualBlock) {
+              // Blockwise Visual mode: The same number of lines and columns.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+            } else if (lastSel.head.line == lastSel.anchor.line) {
+              // Normal Visual mode within one line: The same number of characters.
+              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+            } else {
+              // Normal Visual mode with several lines: The same number of lines, in the
+              // last line the same number of characters as in the last line the last time.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             }
+            vim.visualMode = true;
+            vim.visualLine = lastSel.visualLine;
+            vim.visualBlock = lastSel.visualBlock;
+            sel = vim.sel = {
+              anchor: newAnchor,
+              head: newHead
+            };
+            updateCmSelection(cm);
           } else if (vim.visualMode) {
-            var selOffset = Pos();
-            selOffset.line = curEnd.line - curStart.line;
-            if (selOffset.line) { selOffset.ch = curEnd.ch; }
-            else { selOffset.ch = curEnd.ch - curStart.ch; }
-            operatorArgs.selOffset = selOffset;
+            operatorArgs.lastSel = {
+              anchor: copyCursor(sel.anchor),
+              head: copyCursor(sel.head),
+              visualBlock: vim.visualBlock,
+              visualLine: vim.visualLine
+            };
           }
-          var linewise = motionArgs.linewise ||
-              (vim.visualMode && vim.visualLine) ||
-              operatorArgs.linewise;
-          if (linewise) {
-            // Expand selection to entire line.
-            expandSelectionToLine(cm, curStart, curEnd);
-          } else if (motionArgs.forward) {
-            // Clip to trailing newlines only if the motion goes forward.
-            clipToLine(cm, curStart, curEnd);
+          var curStart, curEnd, linewise, mode;
+          var cmSel;
+          if (vim.visualMode) {
+            // Init visual op
+            curStart = cursorMin(sel.head, sel.anchor);
+            curEnd = cursorMax(sel.head, sel.anchor);
+            linewise = vim.visualLine || operatorArgs.linewise;
+            mode = vim.visualBlock ? 'block' :
+                   linewise ? 'line' :
+                   'char';
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode);
+            if (linewise) {
+              var ranges = cmSel.ranges;
+              if (mode == 'block') {
+                // Linewise operators in visual block mode extend to end of line
+                for (var i = 0; i < ranges.length; i++) {
+                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
+                }
+              } else if (mode == 'line') {
+                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+              }
+            }
+          } else {
+            // Init motion op
+            curStart = copyCursor(newAnchor || oldAnchor);
+            curEnd = copyCursor(newHead || oldHead);
+            if (cursorIsBefore(curEnd, curStart)) {
+              var tmp = curStart;
+              curStart = curEnd;
+              curEnd = tmp;
+            }
+            linewise = motionArgs.linewise || operatorArgs.linewise;
+            if (linewise) {
+              // Expand selection to entire line.
+              expandSelectionToLine(cm, curStart, curEnd);
+            } else if (motionArgs.forward) {
+              // Clip to trailing newlines only if the motion goes forward.
+              clipToLine(cm, curStart, curEnd);
+            }
+            mode = 'char';
+            var exclusive = !motionArgs.inclusive || linewise;
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode, exclusive);
           }
+          cm.setSelections(cmSel.ranges, cmSel.primary);
+          vim.lastMotion = null;
+          operatorArgs.repeat = repeat; // For indent in visual mode.
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
           operatorArgs.linewise = linewise;
-          if (!vim.visualBlock && !blockSelected) {
-            cm.setSelection(curStart, curEnd);
-          }
-          operators[operator](cm, operatorArgs, vim, curStart,
-              curEnd, curOriginal);
+          var operatorMoveTo = operators[operator](
+            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
           if (vim.visualMode) {
             exitVisualMode(cm);
           }
+          if (operatorMoveTo) {
+            cm.setCursor(operatorMoveTo);
+          }
         }
       },
       recordLastEdit: function(vim, inputState, actionCommand) {
@@ -1455,7 +1443,7 @@
      */
     // All of the functions below return Cursor objects.
     var motions = {
-      moveToTopLine: function(cm, motionArgs) {
+      moveToTopLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
@@ -1464,17 +1452,17 @@
         var line = Math.floor((range.top + range.bottom) * 0.5);
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      moveToBottomLine: function(cm, motionArgs) {
+      moveToBottomLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      expandToLine: function(cm, motionArgs) {
+      expandToLine: function(_cm, head, motionArgs) {
         // Expands forward to end of line, and then to next line if repeat is
         // >1. Does not handle backward motion!
-        var cur = cm.getCursor();
+        var cur = head;
         return Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
-      findNext: function(cm, motionArgs) {
+      findNext: function(cm, _head, motionArgs) {
         var state = getSearchState(cm);
         var query = state.getQuery();
         if (!query) {
@@ -1486,7 +1474,7 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
-      goToMark: function(cm, motionArgs, vim) {
+      goToMark: function(cm, _head, motionArgs, vim) {
         var mark = vim.marks[motionArgs.selectedCharacter];
         if (mark) {
           var pos = mark.find();
@@ -1494,22 +1482,19 @@
         }
         return null;
       },
-      moveToOtherHighlightedEnd: function(cm, motionArgs, vim) {
-        var ranges = cm.listSelections();
-        var curEnd = cm.getCursor('head');
-        var curStart = ranges[0].anchor;
-        var curIndex = cursorEqual(ranges[0].head, curEnd) ? ranges.length-1 : 0;
-        if (motionArgs.sameLine && vim.visualBlock) {
-          curStart = Pos(curEnd.line, ranges[curIndex].anchor.ch);
-          curEnd = Pos(ranges[curIndex].head.line, curEnd.ch);
+      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
+        if (vim.visualBlock && motionArgs.sameLine) {
+          var sel = vim.sel;
+          return [
+            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+          ];
         } else {
-          curStart = ranges[curIndex].anchor;
+          return ([vim.sel.head, vim.sel.anchor]);
         }
-        cm.setCursor(curEnd);
-        return ([curEnd, curStart]);
       },
-      jumpToMark: function(cm, motionArgs, vim) {
-        var best = cm.getCursor();
+      jumpToMark: function(cm, head, motionArgs, vim) {
+        var best = head;
         for (var i = 0; i < motionArgs.repeat; i++) {
           var cursor = best;
           for (var key in vim.marks) {
@@ -1546,14 +1531,14 @@
         }
         return best;
       },
-      moveByCharacters: function(cm, motionArgs) {
-        var cur = cm.getCursor();
+      moveByCharacters: function(_cm, head, motionArgs) {
+        var cur = head;
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
         return Pos(cur.line, ch);
       },
-      moveByLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         var endCh = cur.ch;
         // Depending what our last motion was, we may want to do different
         // things. If our last motion was moving vertically, we want to
@@ -1588,8 +1573,8 @@
         vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
         return Pos(line, endCh);
       },
-      moveByDisplayLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByDisplayLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         switch (vim.lastMotion) {
           case this.moveByDisplayLines:
           case this.moveByScroll:
@@ -1616,16 +1601,16 @@
         vim.lastHPos = res.ch;
         return res;
       },
-      moveByPage: function(cm, motionArgs) {
+      moveByPage: function(cm, head, motionArgs) {
         // CodeMirror only exposes functions that move the cursor page down, so
         // doing this bad hack to move the cursor and move it back. evalInput
         // will move the cursor to where it should be in the end.
-        var curStart = cm.getCursor();
+        var curStart = head;
         var repeat = motionArgs.repeat;
         return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
       },
-      moveByParagraph: function(cm, motionArgs) {
-        var line = cm.getCursor().line;
+      moveByParagraph: function(cm, head, motionArgs) {
+        var line = head.line;
         var repeat = motionArgs.repeat;
         var inc = motionArgs.forward ? 1 : -1;
         for (var i = 0; i < repeat; i++) {
@@ -1640,16 +1625,16 @@
         }
         return Pos(line, 0);
       },
-      moveByScroll: function(cm, motionArgs, vim) {
+      moveByScroll: function(cm, head, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
         var curEnd = null;
         var repeat = motionArgs.repeat;
         if (!repeat) {
           repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
         }
-        var orig = cm.charCoords(cm.getCursor(), 'local');
+        var orig = cm.charCoords(head, 'local');
         motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, motionArgs, vim);
+        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
         if (!curEnd) {
           return null;
         }
@@ -1657,11 +1642,11 @@
         cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
         return curEnd;
       },
-      moveByWords: function(cm, motionArgs) {
-        return moveToWord(cm, motionArgs.repeat, !!motionArgs.forward,
+      moveByWords: function(cm, head, motionArgs) {
+        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
             !!motionArgs.wordEnd, !!motionArgs.bigWord);
       },
-      moveTillCharacter: function(cm, motionArgs) {
+      moveTillCharacter: function(cm, _head, motionArgs) {
         var repeat = motionArgs.repeat;
         var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
             motionArgs.selectedCharacter);
@@ -1671,26 +1656,26 @@
         curEnd.ch += increment;
         return curEnd;
       },
-      moveToCharacter: function(cm, motionArgs) {
+      moveToCharacter: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         recordLastCharacterSearch(0, motionArgs);
         return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToSymbol: function(cm, motionArgs) {
+      moveToSymbol: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToColumn: function(cm, motionArgs, vim) {
+      moveToColumn: function(cm, head, motionArgs, vim) {
         var repeat = motionArgs.repeat;
         // repeat is equivalent to which column we want to move to!
         vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(cm.getCursor(),'div').left;
+        vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveToEol: function(cm, head, motionArgs, vim) {
+        var cur = head;
         vim.lastHPos = Infinity;
         var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
         var end=cm.clipPos(retval);
@@ -1698,15 +1683,15 @@
         vim.lastHSPos = cm.charCoords(end,'div').left;
         return retval;
       },
-      moveToFirstNonWhiteSpaceCharacter: function(cm) {
+      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
         // Go to the start of the line where the text begins, or the end for
         // whitespace-only lines
-        var cursor = cm.getCursor();
+        var cursor = head;
         return Pos(cursor.line,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
-      moveToMatchedSymbol: function(cm) {
-        var cursor = cm.getCursor();
+      moveToMatchedSymbol: function(cm, head) {
+        var cursor = head;
         var line = cursor.line;
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
@@ -1727,11 +1712,10 @@
           return cursor;
         }
       },
-      moveToStartOfLine: function(cm) {
-        var cursor = cm.getCursor();
-        return Pos(cursor.line, 0);
+      moveToStartOfLine: function(_cm, head) {
+        return Pos(head.line, 0);
       },
-      moveToLineOrEdgeOfDocument: function(cm, motionArgs) {
+      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
@@ -1739,7 +1723,7 @@
         return Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
-      textObjectManipulation: function(cm, motionArgs) {
+      textObjectManipulation: function(cm, head, motionArgs) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
 
@@ -1768,9 +1752,9 @@
 
         var tmp;
         if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, character, inclusive);
+          tmp = selectCompanionObject(cm, head, character, inclusive);
         } else if (selfPaired[character]) {
-          tmp = findBeginningAndEnd(cm, character, inclusive);
+          tmp = findBeginningAndEnd(cm, head, character, inclusive);
         } else if (character === 'W') {
           tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
                                                      true /** bigWord */);
@@ -1789,7 +1773,7 @@
         }
       },
 
-      repeatLastCharacterSearch: function(cm, motionArgs) {
+      repeatLastCharacterSearch: function(cm, head, motionArgs) {
         var lastSearch = vimGlobalState.lastChararacterSearch;
         var repeat = motionArgs.repeat;
         var forward = motionArgs.forward === lastSearch.forward;
@@ -1799,141 +1783,107 @@
         var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
         if (!curEnd) {
           cm.moveH(increment, 'char');
-          return cm.getCursor();
+          return head;
         }
         curEnd.ch += increment;
         return curEnd;
       }
     };
 
+    function fillArray(val, times) {
+      var arr = [];
+      for (var i = 0; i < times; i++) {
+        arr.push(val);
+      }
+      return arr;
+    }
+    /**
+     * An operator acts on a text selection. It receives the list of selections
+     * as input. The corresponding CodeMirror selection is guaranteed to
+    * match the input selection.
+     */
     var operators = {
-      change: function(cm, operatorArgs, vim) {
-        var selections = cm.listSelections();
-        var start = selections[0], end = selections[selections.length-1];
-        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        var text = cm.getSelection();
-        var visualBlock = vim.visualBlock;
-        if (vim.lastSelection && !vim.visualMode) {
-          visualBlock = vim.lastSelection.visualBlock ? true : visualBlock;
-        }
-        var lastInsertModeChanges = vimGlobalState.macroModeState.lastInsertModeChanges;
-        lastInsertModeChanges.inVisualBlock = visualBlock;
-        var replacement = new Array(selections.length).join('1').split('1');
-        // save the selectionEnd mark
-        var selectionEnd = vim.marks[">"] && vim.marks[">"].find();
-        if (!selectionEnd) {
-          selectionEnd = cm.getCursor("head");
-        }
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'change', text,
-            operatorArgs.linewise);
-        if (operatorArgs.linewise) {
-          // 'C' in visual block extends the block till eol for all lines
-          if (visualBlock){
-            var startLine = curStart.line;
-            while (startLine <= curEnd.line) {
-              var endCh = lineLength(cm, startLine);
-              var head = Pos(startLine, endCh);
-              var anchor = Pos(startLine, curStart.ch);
-              startLine++;
-              cm.replaceRange('', anchor, head);
-            }
-          } else {
-            // Push the next line back down, if there is a next line.
-            replacement = '\n';
-            if (curEnd.line == curStart.line && curEnd.line == cm.lastLine()) {
-              replacement = '';
-            }
-            cm.replaceRange(replacement, curStart, curEnd);
-            cm.indentLine(curStart.line, 'smart');
-            // null ch so setCursor moves to end of line.
-            curStart.ch = null;
-            cm.setCursor(curStart);
-          }
-        } else {
-          // Exclude trailing whitespace if the range is not all whitespace.
-          var text = cm.getRange(curStart, curEnd);
+      change: function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+        if (!vim.visualMode) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          text = cm.getRange(anchor, head);
           if (!isWhiteSpaceString(text)) {
+            // Exclude trailing whitespace if the range is not all whitespace.
             var match = (/\s+$/).exec(text);
             if (match) {
-              curEnd = offsetCursor(curEnd, 0, - match[0].length);
+              head = offsetCursor(head, 0, - match[0].length);
+              text = text.slice(0, - match[0].length);
             }
           }
-          if (visualBlock) {
-            cm.replaceSelections(replacement);
-          } else {
-            cm.setCursor(curStart);
-            cm.replaceRange('', curStart, curEnd);
+          var wasLastLine = head.line - 1 == cm.lastLine();
+          cm.replaceRange('', anchor, head);
+          if (args.linewise && !wasLastLine) {
+            // Push the next line back down, if there is a next line.
+            CodeMirror.commands.newlineAndIndent(cm);
+            // null ch so setCursor moves to end of line.
+            anchor.ch = null;
           }
+          finalHead = anchor;
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
         }
-        vim.marks['>'] = cm.setBookmark(selectionEnd);
-        actions.enterInsertMode(cm, {}, cm.state.vim);
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'change', text,
+            args.linewise, ranges.length > 1);
+        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
       },
       // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, vim) {
-        var selections = cm.listSelections();
-        var start = selections[0], end = selections[selections.length-1];
-        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        // Save the '>' mark before cm.replaceRange clears it.
-        var selectionEnd, selectionStart;
-        var blockwise = vim.visualBlock;
-        if (vim.visualMode) {
-          selectionEnd = vim.marks['>'].find();
-          selectionStart = vim.marks['<'].find();
-        } else if (vim.lastSelection) {
-          selectionEnd = vim.lastSelection.curStartMark.find();
-          selectionStart = vim.lastSelection.curEndMark.find();
-          blockwise = vim.lastSelection.visualBlock;
-        }
-        var text = cm.getSelection();
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', text,
-            operatorArgs.linewise, blockwise);
-        var replacement = new Array(selections.length).join('1').split('1');
-        // If the ending line is past the last line, inclusive, instead of
-        // including the trailing \n, include the \n before the starting line
-        if (operatorArgs.linewise &&
-            curEnd.line == cm.lastLine() && curStart.line == curEnd.line) {
-          if (curEnd.line == 0) {
-            curStart.ch = 0;
+      'delete': function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        if (!vim.visualBlock) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          if (args.linewise &&
+              head.line != cm.firstLine() &&
+              anchor.line == cm.lastLine() &&
+              anchor.line == head.line - 1) {
+            // Special case for dd on last line (and first line).
+            if (anchor.line == cm.firstLine()) {
+              anchor.ch = 0;
+            } else {
+              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+            }
           }
-          else {
-            var tmp = copyCursor(curEnd);
-            curStart.line--;
-            curStart.ch = lineLength(cm, curStart.line);
-            curEnd = tmp;
+          text = cm.getRange(anchor, head);
+          cm.replaceRange('', anchor, head);
+          finalHead = anchor;
+          if (args.linewise) {
+            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
           }
-          cm.replaceRange('', curStart, curEnd);
         } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
           cm.replaceSelections(replacement);
+          finalHead = ranges[0].anchor;
         }
-        // restore the saved bookmark
-        if (selectionEnd) {
-          var curStartMark = cm.setBookmark(selectionStart);
-          var curEndMark = cm.setBookmark(selectionEnd);
-          if (vim.visualMode) {
-            vim.marks['<'] = curStartMark;
-            vim.marks['>'] = curEndMark;
-          } else {
-            vim.lastSelection.curStartMark = curStartMark;
-            vim.lastSelection.curEndMark = curEndMark;
-          }
-        }
-        if (operatorArgs.linewise) {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-        } else {
-          cm.setCursor(curStart);
-        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'delete', text,
+            args.linewise, vim.visualBlock);
+        return finalHead;
       },
-      indent: function(cm, operatorArgs, vim, curStart, curEnd) {
-        var startLine = curStart.line;
-        var endLine = curEnd.line;
+      indent: function(cm, args, ranges) {
+        var vim = cm.state.vim;
+        var startLine = ranges[0].anchor.line;
+        var endLine = vim.visualBlock ?
+          ranges[ranges.length - 1].anchor.line :
+          ranges[0].head.line;
         // In visual mode, n> shifts the selection right n times, instead of
         // shifting n lines right once.
-        var repeat = (vim.visualMode) ? operatorArgs.repeat : 1;
-        if (operatorArgs.linewise) {
+        var repeat = (vim.visualMode) ? args.repeat : 1;
+        if (args.linewise) {
           // The only way to delete a newline is to delete until the start of
           // the next line, so in linewise mode evalInput will include the next
           // line. We don't want this in indent, so we go back a line.
@@ -1941,17 +1891,15 @@
         }
         for (var i = startLine; i <= endLine; i++) {
           for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, operatorArgs.indentRight);
+            cm.indentLine(i, args.indentRight);
           }
         }
-        cm.setCursor(curStart);
-        cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
-      changeCase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
+      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
         var selections = cm.getSelections();
-        var ranges = cm.listSelections();
         var swapped = [];
-        var toLower = operatorArgs.toLower;
+        var toLower = args.toLower;
         for (var j = 0; j < selections.length; j++) {
           var toSwap = selections[j];
           var text = '';
@@ -1969,18 +1917,26 @@
           swapped.push(text);
         }
         cm.replaceSelections(swapped);
-        var curStart  = ranges[0].anchor;
-        var curEnd = ranges[0].head;
-        if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(cursorIsBefore(curStart, curEnd) ? curStart : curEnd);
+        if (args.shouldMoveCursor){
+          return newHead;
+        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
+          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
+        } else if (args.linewise){
+          return oldAnchor;
+        } else {
+          return cursorMin(ranges[0].anchor, ranges[0].head);
         }
       },
-      yank: function(cm, operatorArgs, vim, _curStart, _curEnd, curOriginal) {
+      yank: function(cm, args, ranges, oldAnchor) {
+        var vim = cm.state.vim;
         var text = cm.getSelection();
+        var endPos = vim.visualMode
+          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
+          : oldAnchor;
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'yank',
-            text, operatorArgs.linewise, vim.visualBlock);
-        cm.setCursor(curOriginal);
+            args.registerName, 'yank',
+            text, args.linewise, vim.visualBlock);
+        return endPos;
       }
     };
 
@@ -2072,41 +2028,40 @@
         vim.insertMode = true;
         vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
-        if (vim.visualMode) {
-          var selections = getSelectedAreaRange(cm, vim);
-          var selectionStart = selections[0];
-          var selectionEnd = selections[1];
-        }
+        var sel = vim.sel;
+        var head = actionArgs.head || cm.getCursor('head');
+        var height = cm.listSelections().length;
         if (insertAt == 'eol') {
-          var cursor = cm.getCursor();
-          cursor = Pos(cursor.line, lineLength(cm, cursor.line));
-          cm.setCursor(cursor);
+          head = Pos(head.line, lineLength(cm, head.line));
         } else if (insertAt == 'charAfter') {
-          cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+          head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
-          if (vim.visualMode && !vim.visualBlock) {
-            if (selectionEnd.line < selectionStart.line) {
-              cm.setCursor(selectionEnd);
+          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
+        } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line < sel.anchor.line) {
+              head = sel.head;
             } else {
-              selectionStart = Pos(selectionStart.line, 0);
-              cm.setCursor(selectionStart);
+              head = Pos(sel.anchor.line, 0);
             }
-            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-          } else if (vim.visualBlock) {
-            selectionEnd = Pos(selectionEnd.line, selectionStart.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
           } else {
-            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.min(sel.head.ch, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'endOfSelectedArea') {
-          if (vim.visualBlock) {
-            selectionStart = Pos(selectionStart.line, selectionEnd.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
-          } else if (selectionEnd && selectionEnd.line < selectionStart.line) {
-            selectionEnd = Pos(selectionStart.line, 0);
-            cm.setCursor(selectionEnd);
+          if (!vim.visualBlock) {
+            if (sel.head.line >= sel.anchor.line) {
+              head = offsetCursor(sel.head, 0, 1);
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.max(sel.head.ch + 1, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'inplace') {
           if (vim.visualMode){
@@ -2132,128 +2087,68 @@
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
+        selectForInsert(cm, head, height);
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
-        var curStart = cm.getCursor();
-        var curEnd;
-        var selections = cm.listSelections();
+        var anchor = cm.getCursor();
+        var head;
         // TODO: The repeat should actually select number of characters/lines
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
+          // Entering visual mode
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
-          if (vim.visualLine) {
-            curStart.ch = 0;
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line + repeat - 1, lineLength(cm, curStart.line)),
-              true /** includeLineBreak */);
-          } else {
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line, curStart.ch + repeat),
+          head = clipCursorToContent(
+              cm, Pos(anchor.line, anchor.ch + repeat - 1),
               true /** includeLineBreak */);
-          }
-          cm.setSelection(curStart, curEnd);
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+        } else if (vim.visualLine ^ actionArgs.linewise ||
+            vim.visualBlock ^ actionArgs.blockwise) {
+          // Toggling between modes
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
         } else {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (vim.visualLine) {
-            if (actionArgs.blockwise) {
-              // This means Ctrl-V pressed in linewise visual
-              vim.visualBlock = true;
-              selectBlock(cm, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
-            } else if (!actionArgs.linewise) {
-              // v pressed in linewise, switch to characterwise visual mode
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
-            } else {
-              exitVisualMode(cm);
-            }
-            vim.visualLine = false;
-          } else if (vim.visualBlock) {
-            if (actionArgs.linewise) {
-              // Shift-V pressed in blockwise visual mode
-              vim.visualLine = true;
-              curStart = Pos(selections[0].anchor.line, 0);
-              curEnd = Pos(selections[selections.length-1].anchor.line, lineLength(cm, selections[selections.length-1].anchor.line));
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'linewise'});
-            } else if (!actionArgs.blockwise) {
-              // v pressed in blockwise mode, Switch to characterwise
-              if (curEnd != selections[0].head) {
-                curStart = selections[0].anchor;
-              } else {
-                curStart = selections[selections.length-1].anchor;
-              }
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
-            } else {
-              exitVisualMode(cm);
-            }
-            vim.visualBlock = false;
-          } else if (actionArgs.linewise) {
-              // Shift-V pressed in characterwise visual mode. Switch to linewise
-              // visual mode instead of exiting visual mode.
-              vim.visualLine = true;
-              curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
-                lineLength(cm, curStart.line);
-              curEnd.ch = cursorIsBefore(curStart, curEnd) ?
-                lineLength(cm, curEnd.line) : 0;
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
-            } else if (actionArgs.blockwise) {
-              vim.visualBlock = true;
-              selectBlock(cm, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
-            } else {
-              exitVisualMode(cm);
-            }
+          exitVisualMode(cm);
         }
-        updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
-            : curEnd);
-        updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
-            : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        var curStart = vim.marks['<'].find();
-        var curEnd = vim.marks['>'].find();
         var lastSelection = vim.lastSelection;
+        if (vim.visualMode) {
+          updateLastSelection(cm, vim);
+        }
         if (lastSelection) {
-          // Set the selections as per last selection
-          var selectionStart = lastSelection.curStartMark.find();
-          var selectionEnd = lastSelection.curEndMark.find();
-          var blockwise = lastSelection.visualBlock;
-          // update last selection
-          updateLastSelection(cm, vim, curStart, curEnd);
-          if (blockwise) {
-            cm.setCursor(selectionStart);
-            selectionStart = selectBlock(cm, selectionEnd);
-          } else {
-            cm.setSelection(selectionStart, selectionEnd);
-            selectionStart = cm.getCursor('anchor');
-            selectionEnd = cm.getCursor('head');
-          }
-          if (vim.visualMode) {
-            updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-              : selectionEnd);
-            updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-              : selectionStart);
+          var anchor = lastSelection.anchorMark.find();
+          var head = lastSelection.headMark.find();
+          if (!anchor || !head) {
+            // If the marks have been destroyed due to edits, do nothing.
+            return;
           }
-          // Last selection is updated now
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
           vim.visualMode = true;
-          if (lastSelection.visualLine) {
-            vim.visualLine = true;
-            vim.visualBlock = false;
-          } else if (lastSelection.visualBlock) {
-            vim.visualLine = false;
-            vim.visualBlock = true;
-          } else {
-            vim.visualBlock = vim.visualLine = false;
-          }
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.visualLine = lastSelection.visualLine;
+          vim.visualBlock = lastSelection.visualBlock;
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+          CodeMirror.signal(cm, 'vim-mode-change', {
+            mode: 'visual',
+            subMode: vim.visualLine ? 'linewise' :
+                     vim.visualBlock ? 'blockwise' : ''});
         }
       },
       joinLines: function(cm, actionArgs, vim) {
@@ -2270,18 +2165,19 @@
                                                Infinity));
         }
         var finalCh = 0;
-        cm.operation(function() {
-          for (var i = curStart.line; i < curEnd.line; i++) {
-            finalCh = lineLength(cm, curStart.line);
-            var tmp = Pos(curStart.line + 1,
-                          lineLength(cm, curStart.line + 1));
-            var text = cm.getRange(curStart, tmp);
-            text = text.replace(/\n\s*/g, ' ');
-            cm.replaceRange(text, curStart, tmp);
-          }
-          var curFinalPos = Pos(curStart.line, finalCh);
-          cm.setCursor(curFinalPos);
-        });
+        for (var i = curStart.line; i < curEnd.line; i++) {
+          finalCh = lineLength(cm, curStart.line);
+          var tmp = Pos(curStart.line + 1,
+                        lineLength(cm, curStart.line + 1));
+          var text = cm.getRange(curStart, tmp);
+          text = text.replace(/\n\s*/g, ' ');
+          cm.replaceRange(text, curStart, tmp);
+        }
+        var curFinalPos = Pos(curStart.line, finalCh);
+        cm.setCursor(curFinalPos);
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;
@@ -2377,7 +2273,7 @@
           var emptyStrings = new Array(selections.length).join('1').split('1');
           // save the curEnd marker before it get cleared due to cm.replaceRange.
           if (vim.lastSelection) {
-            lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+            lastSelectionCurEnd = vim.lastSelection.headMark.find();
           }
           // push the previously selected text to unnamed register
           vimGlobalState.registerController.unnamedRegister.setText(selectedText);
@@ -2401,7 +2297,7 @@
           }
           // restore the the curEnd marker
           if(lastSelectionCurEnd) {
-            vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
+            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
           }
           if (linewise) {
             curPosFinal.ch=0;
@@ -2443,10 +2339,10 @@
             }
           }
         }
-        cm.setCursor(curPosFinal);
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
+        cm.setCursor(curPosFinal);
       },
       undo: function(cm, actionArgs) {
         cm.operation(function() {
@@ -2575,8 +2471,18 @@
       return ret;
     }
     function offsetCursor(cur, offsetLine, offsetCh) {
+      if (typeof offsetLine === 'object') {
+        offsetCh = offsetLine.ch;
+        offsetLine = offsetLine.line;
+      }
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
+    function getOffset(anchor, head) {
+      return {
+        line: head.line - anchor.line,
+        ch: head.line - anchor.line
+      };
+    }
     function commandMatches(keys, keyMap, context, inputState) {
       // Partial matches are not applied. They inform the key handler
       // that the current key sequence is a subsequence of a valid key
@@ -2649,9 +2555,15 @@
       return false;
     }
     function cursorMin(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
       return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
     }
     function cursorMax(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
       return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
     }
     function cursorIsBetween(cur1, cur2, cur3) {
@@ -2719,11 +2631,19 @@
         selections.push(range);
       }
       primIndex = head.line == lastLine ? selections.length - 1 : 0;
-      cm.setSelections(selections, primIndex);
+      cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
       return base;
     }
+    function selectForInsert(cm, head, height) {
+      var sel = [];
+      for (var i = 0; i < height; i++) {
+        var lineHead = offsetCursor(head, i, 0);
+        sel.push({anchor: lineHead, head: lineHead});
+      }
+      cm.setSelections(sel, 0);
+    }
     // getIndex returns the index of the cursor in the selections.
     function getIndex(ranges, cursor, end) {
       for (var i = 0; i < ranges.length; i++) {
@@ -2764,8 +2684,8 @@
           }
           cm.setSelections(selections);
         } else {
-          var start = lastSelection.curStartMark.find();
-          var end = lastSelection.curEndMark.find();
+          var start = lastSelection.anchorMark.find();
+          var end = lastSelection.headMark.find();
           var line = end.line - start.line;
           var ch = end.ch - start.ch;
           selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
@@ -2784,36 +2704,28 @@
         return getCurrentSelectedAreaRange();
       }
     }
-    function updateLastSelection(cm, vim, selectionStart, selectionEnd) {
-      if (!selectionStart || !selectionEnd) {
-        selectionStart = vim.marks['<'].find() || cm.getCursor('anchor');
-        selectionEnd = vim.marks['>'].find() || cm.getCursor('head');
-      }
+    // Updates the previous selection with the current selection's values. This
+    // should only be called in visual mode.
+    function updateLastSelection(cm, vim) {
+      var anchor = vim.sel.anchor;
+      var head = vim.sel.head;
       // To accommodate the effect of lastPastedText in the last selection
       if (vim.lastPastedText) {
-        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length);
+        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
         vim.lastPastedText = null;
       }
-      var ranges = cm.listSelections();
-      // This check ensures to set the cursor
-      // position where we left off in previous selection
-      var swap = getIndex(ranges, selectionStart, 'head') > -1;
-      if (vim.visualBlock) {
-        var height = Math.abs(selectionStart.line - selectionEnd.line)+1;
-        var width =  Math.abs(selectionStart.ch - selectionEnd.ch);
-        var block = {height: height, width: width};
-      }
-      // can't use selection state here because yank has already reset its cursor
-      // Also, Bookmarks make the visual selections robust to edit operations
-      vim.lastSelection = {'curStartMark': cm.setBookmark(swap ? selectionEnd : selectionStart),
-                           'curEndMark': cm.setBookmark(swap ? selectionStart : selectionEnd),
+      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
+                           'headMark': cm.setBookmark(head),
+                           'anchor': copyCursor(anchor),
+                           'head': copyCursor(head),
                            'visualMode': vim.visualMode,
                            'visualLine': vim.visualLine,
-                           'visualBlock': block};
+                           'visualBlock': vim.visualBlock};
     }
     function expandSelection(cm, start, end) {
-      var head = cm.getCursor('head');
-      var anchor = cm.getCursor('anchor');
+      var sel = cm.state.vim.sel;
+      var head = sel.head;
+      var anchor = sel.anchor;
       var tmp;
       if (cursorIsBefore(end, start)) {
         tmp = end;
@@ -2826,9 +2738,75 @@
       } else {
         anchor = cursorMin(start, anchor);
         head = cursorMax(head, end);
+        head = offsetCursor(head, 0, -1);
+        if (head.ch == -1 && head.line != cm.firstLine()) {
+          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+        }
       }
       return [anchor, head];
     }
+    /**
+     * Updates the CodeMirror selection to match the provided vim selection.
+     * If no arguments are given, it uses the current vim selection state.
+     */
+    function updateCmSelection(cm, sel, mode) {
+      var vim = cm.state.vim;
+      sel = sel || vim.sel;
+      var mode = mode ||
+        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
+      var cmSel = makeCmSelection(cm, sel, mode);
+      cm.setSelections(cmSel.ranges, cmSel.primary);
+      updateFakeCursor(cm);
+    }
+    function makeCmSelection(cm, sel, mode, exclusive) {
+      var head = copyCursor(sel.head);
+      var anchor = copyCursor(sel.anchor);
+      if (mode == 'char') {
+        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        head = offsetCursor(sel.head, 0, headOffset);
+        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'line') {
+        if (!cursorIsBefore(sel.head, sel.anchor)) {
+          anchor.ch = 0;
+
+          var lastLine = cm.lastLine();
+          if (head.line > lastLine) {
+            head.line = lastLine;
+          }
+          head.ch = lineLength(cm, head.line);
+        } else {
+          head.ch = 0;
+          anchor.ch = lineLength(cm, anchor.line);
+        }
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'block') {
+        var top = Math.min(anchor.line, head.line),
+            left = Math.min(anchor.ch, head.ch),
+            bottom = Math.max(anchor.line, head.line),
+            right = Math.max(anchor.ch, head.ch) + 1;
+        var height = bottom - top + 1;
+        var primary = head.line == top ? 0 : height - 1;
+        var ranges = [];
+        for (var i = 0; i < height; i++) {
+          ranges.push({
+            anchor: Pos(top + i, left),
+            head: Pos(top + i, right)
+          });
+        }
+        return {
+          ranges: ranges,
+          primary: primary
+        };
+      }
+    }
     function getHead(cm) {
       var cur = cm.getCursor('head');
       if (cm.getSelection().length == 1) {
@@ -2839,22 +2817,20 @@
       return cur;
     }
 
-    function exitVisualMode(cm) {
+    /**
+     * If moveHead is set to false, the CodeMirror selection will not be
+     * touched. The caller assumes the responsibility of putting the cursor
+    * in the right place.
+     */
+    function exitVisualMode(cm, moveHead) {
       var vim = cm.state.vim;
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      // hack to place the cursor at the right place
-      // in case of visual block
-      if (vim.visualBlock && (cursorIsBefore(selectionStart, selectionEnd))) {
-          selectionEnd.ch--;
+      if (moveHead !== false) {
+        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
       }
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
       vim.visualBlock = false;
-      if (!cursorEqual(selectionStart, selectionEnd)) {
-        cm.setCursor(clipCursorToContent(cm, selectionEnd));
-      }
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
@@ -3184,6 +3160,7 @@
 
     /**
      * @param {CodeMirror} cm CodeMirror object.
+     * @param {Pos} cur The position to start from.
      * @param {int} repeat Number of words to move past.
      * @param {boolean} forward True to search forward. False to search
      *     backward.
@@ -3193,8 +3170,7 @@
      *     False if only alphabet characters count as part of the word.
      * @return {Cursor} The position the cursor should move to.
      */
-    function moveToWord(cm, repeat, forward, wordEnd, bigWord) {
-      var cur = cm.getCursor();
+    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
       var curStart = copyCursor(cur);
       var words = [];
       if (forward && !wordEnd || !forward && wordEnd) {
@@ -3294,8 +3270,8 @@
 
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
-    function selectCompanionObject(cm, symb, inclusive) {
-      var cur = getHead(cm), start, end;
+    function selectCompanionObject(cm, head, symb, inclusive) {
+      var cur = head, start, end;
 
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
@@ -3339,8 +3315,8 @@
     // Takes in a symbol and a cursor and tries to simulate text objects that
     // have identical opening and closing symbols
     // TODO support across multiple lines
-    function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = copyCursor(getHead(cm));
+    function findBeginningAndEnd(cm, head, symb, inclusive) {
+      var cur = copyCursor(head);
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
@@ -4681,45 +4657,49 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else {
+      } else if (!cm.curOp.isVimOp) {
         handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
-        var from, head;
-        from = head = cm.getCursor('head');
-        var anchor = cm.getCursor('anchor');
-        var to = Pos(head.line, from.ch + (cursorIsBefore(anchor, head) ? -1 : 1));
-        if (cursorIsBefore(to, from)) {
-          var temp = from;
-          from = to;
-          to = temp;
-        }
-        if (vim.fakeCursor) {
-          vim.fakeCursor.clear();
-        }
-        vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+        updateFakeCursor(cm);
       }
     }
-
+    function updateFakeCursor(cm) {
+      var vim = cm.state.vim;
+      var from = copyCursor(vim.sel.head);
+      var to = offsetCursor(from, 0, 1);
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+    }
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
       var head = cm.getCursor('head');
       // Enter or exit visual mode to match mouse selection.
       if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
-        exitVisualMode(cm);
-      } else if (!cm.curOp.isVimOp && !vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        exitVisualMode(cm, false);
+      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
         vim.visualMode = true;
         vim.visualLine = false;
         CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
       }
-      if (!cm.curOp.isVimOp) {
-        if (vim.visualMode) {
-          updateMark(cm, vim, '<', cursorMin(head, anchor));
-          updateMark(cm, vim, '>', cursorMax(head, anchor));
-        } else if (!vim.insertMode) {
-          // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
-          vim.lastHPos = cm.getCursor().ch;
-        }
+      if (vim.visualMode) {
+        // Bind CodeMirror selection model to vim selection model.
+        // Mouse selections are considered visual characterwise.
+        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
+        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
+        head = offsetCursor(head, 0, headOffset);
+        anchor = offsetCursor(anchor, 0, anchorOffset);
+        vim.sel = {
+          anchor: anchor,
+          head: head
+        };
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      } else if (!vim.insertMode) {
+        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+        vim.lastHPos = cm.getCursor().ch;
       }
     }
 
@@ -4811,19 +4791,21 @@
         }
         return true;
       }
-      var curStart = cm.getCursor();
+      var head = cm.getCursor('head');
       var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
       if (inVisualBlock) {
         // Set up block selection again for repeating the changes.
         var vim = cm.state.vim;
-        var block = vim.lastSelection.visualBlock;
-        var curEnd = Pos(curStart.line + block.height-1, curStart.ch);
-        cm.setCursor(curStart);
-        selectBlock(cm, curEnd);
+        var lastSel = vim.lastSelection;
+        var offset = getOffset(lastSel.anchor, lastSel.head);
+        selectForInsert(cm, head, offset.line + 1);
         repeat = cm.listSelections().length;
-        cm.setCursor(curStart);
+        cm.setCursor(head);
       }
       for (var i = 0; i < repeat; i++) {
+        if (inVisualBlock) {
+          cm.setCursor(offsetCursor(head, i, 0));
+        }
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
@@ -4833,10 +4815,9 @@
             cm.replaceRange(change, cur, cur);
           }
         }
-        if (inVisualBlock) {
-          curStart.line++;
-          cm.setCursor(curStart);
-        }
+      }
+      if (inVisualBlock) {
+        cm.setCursor(offsetCursor(head, 0, 1));
       }
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 7f016c479b..7eb8f6d8f7 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -898,32 +898,36 @@ testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   is(register.linewise);
   eq('vim-insert', cm.getOption('keyMap'));
 });
-testVim('cc_append', function(cm, vim, helpers) {
+testVim('cc_should_not_append_to_document', function(cm, vim, helpers) {
   var expectedLineCount = cm.lineCount();
   cm.setCursor(cm.lastLine(), 0);
   helpers.doKeys('c', 'c');
   eq(expectedLineCount, cm.lineCount());
 });
+function fillArray(val, times) {
+  var arr = [];
+  for (var i = 0; i < times; i++) {
+    arr.push(val);
+  }
+  return arr;
+}
 testVim('c_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
+  var replacement = fillArray('hello', 3);
   cm.replaceSelections(replacement);
   eq('1hello\n5hello\nahellofg', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
-  replacement = new Array(cm.listSelections().length+1).join('world ').split(' ');
-  replacement.pop();
+  replacement = fillArray('world', 3);
   cm.replaceSelections(replacement);
   eq('1hworld\n5hworld\nahworld', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 testVim('c_visual_block_replay', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  var replacement = new Array(cm.listSelections().length+1).join('fo ').split(' ');
-  replacement.pop();
+  var replacement = fillArray('fo', 3);
   cm.replaceSelections(replacement);
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
   helpers.doKeys('<Esc>');
@@ -932,6 +936,17 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
   eq('foo4\nfoo8\nfoodefg', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 
+testVim('d_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'd');
+  eq('1\n5\nafg', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('D_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'D');
+  eq('1\n5\na', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and
@@ -955,7 +970,7 @@ testVim('g~g~', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  eqPos({line: curStart.line, ch:0}, cm.getCursor());
+  eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
 testVim('gu_and_gU', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 7);
@@ -1263,7 +1278,7 @@ testVim('a_eol', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, lines[0].length);
   eq('vim-insert', cm.getOption('keyMap'));
 });
-testVim('a_endOfSelectedArea', function(cm, vim, helpers) {
+testVim('A_endOfSelectedArea', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'j', 'l');
   helpers.doKeys('A');
@@ -1726,6 +1741,49 @@ testVim('visual', function(cm, vim, helpers) {
   helpers.doKeys('d');
   eq('15', cm.getValue());
 }, { value: '12345' });
+testVim('visual_yank', function(cm, vim, helpers) {
+  helpers.doKeys('v', '3', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('p');
+  eq('aa te test for yank', cm.getValue());
+}, { value: 'a test for yank' })
+testVim('visual_w', function(cm, vim, helpers) {
+  helpers.doKeys('v', 'w');
+  eq(cm.getSelection(), 'motion t');
+}, { value: 'motion test'});
+testVim('visual_initial_selection', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v');
+  cm.getSelection('n');
+}, { value: 'init'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'l', 'h', 'h');
+  cm.getSelection('ro');
+}, { value: 'cross'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'h', 'l', 'l');
+  cm.getSelection('os');
+}, { value: 'cross'});
+testVim('visual_crossover_up', function(cm, vim, helpers) {
+  cm.setCursor(3, 2);
+  helpers.doKeys('v', 'j', 'k', 'k');
+  eqPos(Pos(2, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+  helpers.doKeys('k');
+  eqPos(Pos(1, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
+testVim('visual_crossover_down', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('v', 'k', 'j', 'j');
+  eqPos(Pos(2, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+  helpers.doKeys('j');
+  eqPos(Pos(3, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
   eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
@@ -1735,20 +1793,23 @@ testVim('visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
   eq(' 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_block', function(cm, vim, helpers) {
+testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
   // test the block selection with lines of different length
   // i.e. extending the selection
   // till the end of the longest line.
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '6', 'l', 'd');
   helpers.doKeys('d', 'd', 'd', 'd');
   eq('', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('visual_block_truncate_on_short_line', function(cm, vim, helpers) {
   // check for left side selection in case
   // of moving up to a shorter line.
-  cm.replaceRange('hello world\n{\nthis is\nsparta!', cm.getCursor());
+  cm.replaceRange('', cm.getCursor());
   cm.setCursor(3, 4);
   helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
   eq('hello world\n{\ntis\nsa!', cm.getValue());
-  cm.replaceRange('12345\n67891\nabcde', {line: 0, ch: 0}, {line: cm.lastLine(), ch: 6});
+}, {value: 'hello world\n{\nthis is\nsparta!'});
+testVim('visual_block_corners', function(cm, vim, helpers) {
   cm.setCursor(1, 2);
   helpers.doKeys('<C-v>', '2', 'l', 'k');
   // circle around the anchor
@@ -1764,6 +1825,8 @@ testVim('visual_block', function(cm, vim, helpers) {
   helpers.doKeys('4', 'l');
   selections = cm.getSelections();
   eq('891cde', selections.join(''));
+}, {value: '12345\n67891\nabcde'});
+testVim('visual_block_mode_switch', function(cm, vim, helpers) {
   // switch between visual modes
   cm.setCursor(1, 1);
   // blockwise to characterwise visual
@@ -1778,7 +1841,7 @@ testVim('visual_block', function(cm, vim, helpers) {
   helpers.doKeys('V');
   selections = cm.getSelections();
   eq('67891\nabcde', selections.join(''));
-}, {value: '1234\n5678\nabcdefg'});
+}, {value: '12345\n67891\nabcde'});
 testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
   // visual block with long and short lines
   cm.setCursor(0, 3);
@@ -1858,12 +1921,15 @@ testVim('reselect_visual_block', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
   cm.setCursor(2, 1);
   helpers.doKeys('v', 'l', 'g', 'v');
-  helpers.assertCursorAt(0, 1);
+  eqPos(Pos(1, 2), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
   // Ensure selection is done with visual block mode rather than one
   // continuous range.
   eq(cm.getSelections().join(''), '23oo')
   helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 3);
+  eqPos(Pos(2, 1), vim.sel.anchor);
+  eqPos(Pos(2, 2), vim.sel.head);
+  helpers.doKeys('<Esc>');
   // Ensure selection of deleted range
   cm.setCursor(1, 1);
   helpers.doKeys('v', '<C-v>', 'j', 'd', 'g', 'v');
@@ -1897,11 +1963,14 @@ testVim('o_visual', function(cm, vim, helpers) {
 testVim('o_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>','3','j','l','l', 'o');
-  helpers.assertCursorAt(0, 1);
+  eqPos(Pos(3, 3), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
   helpers.doKeys('O');
-  helpers.assertCursorAt(0, 4);
+  eqPos(Pos(3, 1), vim.sel.anchor);
+  eqPos(Pos(0, 3), vim.sel.head);
   helpers.doKeys('o');
-  helpers.assertCursorAt(3, 1);
+  eqPos(Pos(0, 3), vim.sel.anchor);
+  eqPos(Pos(3, 1), vim.sel.head);
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
 testVim('changeCase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -1936,7 +2005,9 @@ testVim('changeCase_visual_block', function(cm, vim, helpers) {
 }, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
 testVim('visual_paste', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l', 'y', 'j', 'v', 'l', 'p');
+  helpers.doKeys('v', 'l', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('3', 'l', 'j', 'v', 'l', 'p');
   helpers.assertCursorAt(1, 5);
   eq('this is a\nunithitest for visual paste', cm.getValue());
   cm.setCursor(0, 0);

From 29b78d2e0a369c95fc4a1a4e1bc1adaa2095431f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 12:16:44 +0100
Subject: [PATCH 64/71] [sql mode] Remove outdated comment

---
 mode/sql/sql.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 799492f51b..f2c2384a72 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -367,8 +367,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   keywords:
     A list of keywords you want to be highlighted.
-  functions:
-    A list of function names you want to be highlighted.
   builtin:
     A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
   operatorChars:

From ff4e64092592214c1bbb5b267d8ab2db6f4241ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:43:40 +0100
Subject: [PATCH 65/71] [stex mode] Sanitize comment parsing

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

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 14f6fcc3cb..470c4f150f 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -128,10 +128,7 @@ CodeMirror.defineMode("stex", function() {
 
         var ch = source.next();
         if (ch == "%") {
-            // special case: % at end of its own line; stay in same state
-            if (!source.eol()) {
-              setState(state, inCComment);
-            }
+            source.skipToEnd();
             return "comment";
         }
         else if (ch == '}' || ch == ']') {
@@ -163,12 +160,6 @@ CodeMirror.defineMode("stex", function() {
         }
     }
 
-    function inCComment(source, state) {
-        source.skipToEnd();
-        setState(state, normal);
-        return "comment";
-    }
-
     function inMathMode(source, state, endModeSeq) {
         if (source.eatSpace()) {
             return null;
@@ -207,11 +198,8 @@ CodeMirror.defineMode("stex", function() {
             return "bracket";
         }
 
-        // eat comments here, because inCComment returns us to normal state!
         if (ch == "%") {
-            if (!source.eol()) {
-                source.skipToEnd();
-            }
+            source.skipToEnd();
             return "comment";
         }
         return "error";

From 21576a30702cd643c7415e68b70b170da3ac59b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:44:21 +0100
Subject: [PATCH 66/71] [stex mode] Set to two-space indentation

---
 mode/stex/stex.js | 366 +++++++++++++++++++++++++++---------------------------
 1 file changed, 183 insertions(+), 183 deletions(-)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 470c4f150f..60c32949be 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -14,60 +14,60 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
+  "use strict";
 
-CodeMirror.defineMode("stex", function() {
+  CodeMirror.defineMode("stex", function() {
     "use strict";
 
     function pushCommand(state, command) {
-        state.cmdState.push(command);
+      state.cmdState.push(command);
     }
 
     function peekCommand(state) {
-        if (state.cmdState.length > 0) {
-            return state.cmdState[state.cmdState.length - 1];
-        } else {
-            return null;
-        }
+      if (state.cmdState.length > 0) {
+        return state.cmdState[state.cmdState.length - 1];
+      } else {
+        return null;
+      }
     }
 
     function popCommand(state) {
-        var plug = state.cmdState.pop();
-        if (plug) {
-            plug.closeBracket();
-        }
+      var plug = state.cmdState.pop();
+      if (plug) {
+        plug.closeBracket();
+      }
     }
 
     // returns the non-default plugin closest to the end of the list
     function getMostPowerful(state) {
-        var context = state.cmdState;
-        for (var i = context.length - 1; i >= 0; i--) {
-            var plug = context[i];
-            if (plug.name == "DEFAULT") {
-                continue;
-            }
-            return plug;
-        }
-        return { styleIdentifier: function() { return null; } };
+      var context = state.cmdState;
+      for (var i = context.length - 1; i >= 0; i--) {
+        var plug = context[i];
+        if (plug.name == "DEFAULT") {
+          continue;
+        }
+        return plug;
+      }
+      return { styleIdentifier: function() { return null; } };
     }
 
     function addPluginPattern(pluginName, cmdStyle, styles) {
-        return function () {
-            this.name = pluginName;
-            this.bracketNo = 0;
-            this.style = cmdStyle;
-            this.styles = styles;
-            this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
-
-            this.styleIdentifier = function() {
-                return this.styles[this.bracketNo - 1] || null;
-            };
-            this.openBracket = function() {
-                this.bracketNo++;
-                return "bracket";
-            };
-            this.closeBracket = function() {};
+      return function () {
+        this.name = pluginName;
+        this.bracketNo = 0;
+        this.style = cmdStyle;
+        this.styles = styles;
+        this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
+
+        this.styleIdentifier = function() {
+          return this.styles[this.bracketNo - 1] || null;
+        };
+        this.openBracket = function() {
+          this.bracketNo++;
+          return "bracket";
         };
+        this.closeBracket = function() {};
+      };
     }
 
     var plugins = {};
@@ -79,172 +79,172 @@ CodeMirror.defineMode("stex", function() {
     plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
 
     plugins["DEFAULT"] = function () {
-        this.name = "DEFAULT";
-        this.style = "tag";
+      this.name = "DEFAULT";
+      this.style = "tag";
 
-        this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
+      this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
     };
 
     function setState(state, f) {
-        state.f = f;
+      state.f = f;
     }
 
     // called when in a normal (no environment) context
     function normal(source, state) {
-        var plug;
-        // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            var cmdName = source.current().slice(1);
-            plug = plugins[cmdName] || plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            setState(state, beginParams);
-            return plug.style;
-        }
-
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-
-        // white space control characters
-        if (source.match(/^\\[,;!\/\\]/)) {
-          return "tag";
-        }
-
-        // find if we're starting various math modes
-        if (source.match("\\[")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
-            return "keyword";
-        }
-        if (source.match("$$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
-            return "keyword";
-        }
-        if (source.match("$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$"); });
-            return "keyword";
-        }
-
-        var ch = source.next();
-        if (ch == "%") {
-            source.skipToEnd();
-            return "comment";
-        }
-        else if (ch == '}' || ch == ']') {
-            plug = peekCommand(state);
-            if (plug) {
-                plug.closeBracket(ch);
-                setState(state, beginParams);
-            } else {
-                return "error";
-            }
-            return "bracket";
-        } else if (ch == '{' || ch == '[') {
-            plug = plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            return "bracket";
-        }
-        else if (/\d/.test(ch)) {
-            source.eatWhile(/[\w.%]/);
-            return "atom";
-        }
-        else {
-            source.eatWhile(/[\w\-_]/);
-            plug = getMostPowerful(state);
-            if (plug.name == 'begin') {
-                plug.argument = source.current();
-            }
-            return plug.styleIdentifier();
-        }
+      var plug;
+      // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        var cmdName = source.current().slice(1);
+        plug = plugins[cmdName] || plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        setState(state, beginParams);
+        return plug.style;
+      }
+
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+
+      // white space control characters
+      if (source.match(/^\\[,;!\/\\]/)) {
+        return "tag";
+      }
+
+      // find if we're starting various math modes
+      if (source.match("\\[")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
+        return "keyword";
+      }
+      if (source.match("$$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
+        return "keyword";
+      }
+      if (source.match("$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$"); });
+        return "keyword";
+      }
+
+      var ch = source.next();
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      }
+      else if (ch == '}' || ch == ']') {
+        plug = peekCommand(state);
+        if (plug) {
+          plug.closeBracket(ch);
+          setState(state, beginParams);
+        } else {
+          return "error";
+        }
+        return "bracket";
+      } else if (ch == '{' || ch == '[') {
+        plug = plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        return "bracket";
+      }
+      else if (/\d/.test(ch)) {
+        source.eatWhile(/[\w.%]/);
+        return "atom";
+      }
+      else {
+        source.eatWhile(/[\w\-_]/);
+        plug = getMostPowerful(state);
+        if (plug.name == 'begin') {
+          plug.argument = source.current();
+        }
+        return plug.styleIdentifier();
+      }
     }
 
     function inMathMode(source, state, endModeSeq) {
-        if (source.eatSpace()) {
-            return null;
-        }
-        if (source.match(endModeSeq)) {
-            setState(state, normal);
-            return "keyword";
-        }
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            return "tag";
-        }
-        if (source.match(/^[a-zA-Z]+/)) {
-            return "variable-2";
-        }
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-        // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
-          return "tag";
-        }
-        // special math-mode characters
-        if (source.match(/^[\^_&]/)) {
-          return "tag";
-        }
-        // non-special characters
-        if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
-            return null;
-        }
-        if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
-          return "number";
-        }
-        var ch = source.next();
-        if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
-            return "bracket";
-        }
-
-        if (ch == "%") {
-            source.skipToEnd();
-            return "comment";
-        }
-        return "error";
+      if (source.eatSpace()) {
+        return null;
+      }
+      if (source.match(endModeSeq)) {
+        setState(state, normal);
+        return "keyword";
+      }
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        return "tag";
+      }
+      if (source.match(/^[a-zA-Z]+/)) {
+        return "variable-2";
+      }
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+      // white space control characters
+      if (source.match(/^\\[,;!\/]/)) {
+        return "tag";
+      }
+      // special math-mode characters
+      if (source.match(/^[\^_&]/)) {
+        return "tag";
+      }
+      // non-special characters
+      if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
+        return null;
+      }
+      if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
+        return "number";
+      }
+      var ch = source.next();
+      if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
+        return "bracket";
+      }
+
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      }
+      return "error";
     }
 
     function beginParams(source, state) {
-        var ch = source.peek(), lastPlug;
-        if (ch == '{' || ch == '[') {
-            lastPlug = peekCommand(state);
-            lastPlug.openBracket(ch);
-            source.eat(ch);
-            setState(state, normal);
-            return "bracket";
-        }
-        if (/[ \t\r]/.test(ch)) {
-            source.eat(ch);
-            return null;
-        }
+      var ch = source.peek(), lastPlug;
+      if (ch == '{' || ch == '[') {
+        lastPlug = peekCommand(state);
+        lastPlug.openBracket(ch);
+        source.eat(ch);
         setState(state, normal);
-        popCommand(state);
-
-        return normal(source, state);
+        return "bracket";
+      }
+      if (/[ \t\r]/.test(ch)) {
+        source.eat(ch);
+        return null;
+      }
+      setState(state, normal);
+      popCommand(state);
+
+      return normal(source, state);
     }
 
     return {
-        startState: function() {
-            return {
-                cmdState: [],
-                f: normal
-            };
-        },
-        copyState: function(s) {
-            return {
-                cmdState: s.cmdState.slice(),
-                f: s.f
-            };
-        },
-        token: function(stream, state) {
-            return state.f(stream, state);
-        },
-        lineComment: "%"
+      startState: function() {
+        return {
+          cmdState: [],
+          f: normal
+        };
+      },
+      copyState: function(s) {
+        return {
+          cmdState: s.cmdState.slice(),
+          f: s.f
+        };
+      },
+      token: function(stream, state) {
+        return state.f(stream, state);
+      },
+      lineComment: "%"
     };
-});
+  });
 
-CodeMirror.defineMIME("text/x-stex", "stex");
-CodeMirror.defineMIME("text/x-latex", "stex");
+  CodeMirror.defineMIME("text/x-stex", "stex");
+  CodeMirror.defineMIME("text/x-latex", "stex");
 
 });

From ccddb1ebcce7ba5adef37bf1a63eb08c791ecf1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:49:08 +0100
Subject: [PATCH 67/71] [stex mode] Reset tokenizer after blank line

This prevents a stray $ from setting the whole rest of
the document to math mode.

Closes #2928
---
 mode/stex/stex.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 60c32949be..4be533c54e 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -240,6 +240,9 @@
       token: function(stream, state) {
         return state.f(stream, state);
       },
+      blankLine: function(state) {
+        state.f = normal;
+      },
       lineComment: "%"
     };
   });

From 13af2af2d7beb8395257dc095861dfcdea5d33cb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 16:38:04 +0100
Subject: [PATCH 68/71] [loadmode addon] Work with requirejs

See http://discuss.codemirror.net/t/loadmode-js
---
 addon/mode/loadmode.js | 35 +++++++++++++++++++----------------
 test/lint/lint.js      |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 804215877f..10117ec22f 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -3,12 +3,12 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), "cjs");
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, "plain");
+})(function(CodeMirror, env) {
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};
@@ -35,21 +35,24 @@
     if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
     if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 
-    var script = document.createElement("script");
-    script.src = CodeMirror.modeURL.replace(/%N/g, mode);
-    var others = document.getElementsByTagName("script")[0];
-    others.parentNode.insertBefore(script, others);
-    var list = loading[mode] = [cont];
-    var count = 0, poll = setInterval(function() {
-      if (++count > 100) return clearInterval(poll);
-      if (CodeMirror.modes.hasOwnProperty(mode)) {
-        clearInterval(poll);
-        loading[mode] = null;
+    var file = CodeMirror.modeURL.replace(/%N/g, mode);
+    if (env == "plain") {
+      var script = document.createElement("script");
+      script.src = file;
+      var others = document.getElementsByTagName("script")[0];
+      var list = loading[mode] = [cont];
+      CodeMirror.on(script, "load", function() {
         ensureDeps(mode, function() {
           for (var i = 0; i < list.length; ++i) list[i]();
         });
-      }
-    }, 200);
+      });
+      others.parentNode.insertBefore(script, others);
+    } else if (env == "cjs") {
+      require(file);
+      cont();
+    } else if (env == "amd") {
+      requirejs([file], cont);
+    }
   };
 
   CodeMirror.autoLoadMode = function(instance, mode) {
diff --git a/test/lint/lint.js b/test/lint/lint.js
index c2c45262a6..b0248290cf 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -22,7 +22,7 @@ var topAllowedGlobals = Object.create(null);
  "screen FileReader Worker postMessage importScripts " +
  "setInterval clearInterval setTimeout clearTimeout " +
  "CodeMirror " +
- "test exports require module define")
+ "test exports require module define requirejs")
   .split(" ").forEach(function(n) { topAllowedGlobals[n] = true; });
 
 var fs = require("fs"), acorn = require("./acorn.js"), walk = require("./walk.js");

From fc25da484ba306bc7f8ea72211ba9e5284413b72 Mon Sep 17 00:00:00 2001
From: "Nicholas Bollweg (Nick)" <nick.bollweg@gmail.com>
Date: Fri, 21 Nov 2014 21:32:41 -0500
Subject: [PATCH 69/71] [sparql mode] Update with more details from 1.1

- more style classes: operator, builtin, meta, brackets
- literal metas (@ and ^^)
- many more operators
- mime type and extension from spec
---
 mode/meta.js           |  2 +-
 mode/sparql/index.html |  4 ++--
 mode/sparql/sparql.js  | 23 +++++++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index 94cf192976..945b9b565b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -102,7 +102,7 @@
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
     {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
-    {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ["sparql"]},
+    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 6f24206b1e..02837ab346 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -43,11 +43,11 @@
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "application/x-sparql-query",
+        mode: "application/sparql-query",
         matchBrackets: true
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>application/x-sparql-query</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>application/sparql-query</code>.</p>
 
   </article>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 64dbb612c2..0d006dcd34 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -19,11 +19,18 @@ CodeMirror.defineMode("sparql", function(config) {
     return new RegExp("^(?:" + words.join("|") + ")$", "i");
   }
   var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
+                        "iri", "uri", "bnode", "count", "sum", "min", "max", "avg", "sample",
+                        "group_concat", "rand", "abs", "ceil", "floor", "round", "concat", "substr", "strlen",
+                        "replace", "ucase", "lcase", "encode_for_uri", "contains", "strstarts", "strends",
+                        "strbefore", "strafter", "year", "month", "day", "hours", "minutes", "seconds",
+                        "timezone", "tz", "now", "uuid", "struuid", "md5", "sha1", "sha256", "sha384",
+                        "sha512", "coalesce", "if", "strlang", "strdt", "isnumeric", "regex", "exists",
                         "isblank", "isliteral", "a"]);
   var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
                              "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
                              "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
                              "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
+                             "true", "false", "with",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
   var operatorChars = /[*+\-<>=&|]/;
 
@@ -44,7 +51,7 @@ CodeMirror.defineMode("sparql", function(config) {
     }
     else if (/[{}\(\),\.;\[\]]/.test(ch)) {
       curPunc = ch;
-      return null;
+      return "bracket";
     }
     else if (ch == "#") {
       stream.skipToEnd();
@@ -52,12 +59,20 @@ CodeMirror.defineMode("sparql", function(config) {
     }
     else if (operatorChars.test(ch)) {
       stream.eatWhile(operatorChars);
-      return null;
+      return "operator";
     }
     else if (ch == ":") {
       stream.eatWhile(/[\w\d\._\-]/);
       return "atom";
     }
+    else if (ch == "@") {
+      stream.eatWhile(/[a-z\d\-]/i);
+      return "meta";
+    }
+    else if (ch == "^") {
+      stream.eatWhile(/\^/);
+      return "meta";
+    }
     else {
       stream.eatWhile(/[_\w\d]/);
       if (stream.eat(":")) {
@@ -66,7 +81,7 @@ CodeMirror.defineMode("sparql", function(config) {
       }
       var word = stream.current();
       if (ops.test(word))
-        return null;
+        return "builtin";
       else if (keywords.test(word))
         return "keyword";
       else
@@ -155,6 +170,6 @@ CodeMirror.defineMode("sparql", function(config) {
   };
 });
 
-CodeMirror.defineMIME("application/x-sparql-query", "sparql");
+CodeMirror.defineMIME("application/sparql-query", "sparql");
 
 });

From 096a20aa459eceebd1c0e960b80d395998b46a47 Mon Sep 17 00:00:00 2001
From: "Nicholas Bollweg (Nick)" <nick.bollweg@gmail.com>
Date: Fri, 21 Nov 2014 22:05:12 -0500
Subject: [PATCH 70/71] [sparql mode] Property paths

---
 mode/sparql/index.html | 16 ++++++++++++----
 mode/sparql/sparql.js  |  9 ++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 02837ab346..84ef4d3639 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -29,15 +29,23 @@
 PREFIX a: &lt;http://www.w3.org/2000/10/annotation-ns#>
 PREFIX dc: &lt;http://purl.org/dc/elements/1.1/>
 PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/>
+PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#>
 
 # Comment!
 
 SELECT ?given ?family
 WHERE {
-  ?annot a:annotates &lt;http://www.w3.org/TR/rdf-sparql-query/> .
-  ?annot dc:creator ?c .
-  OPTIONAL {?c foaf:given ?given ;
-               foaf:family ?family } .
+  {
+    ?annot a:annotates &lt;http://www.w3.org/TR/rdf-sparql-query/> .
+    ?annot dc:creator ?c .
+    OPTIONAL {?c foaf:givenName ?given ;
+                 foaf:familyName ?family }
+  } UNION {
+    ?c !foaf:knows/foaf:knows? ?thing.
+    ?thing rdfs
+  } MINUS {
+    ?thing rdfs:label "剛柔流"@jp
+  }
   FILTER isBlank(?c)
 }
 </textarea></form>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 0d006dcd34..bbf8a76a0d 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -32,12 +32,15 @@ CodeMirror.defineMode("sparql", function(config) {
                              "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
                              "true", "false", "with",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
-  var operatorChars = /[*+\-<>=&|]/;
+  var operatorChars = /[*+\-<>=&|\^\/!\?]/;
 
   function tokenBase(stream, state) {
     var ch = stream.next();
     curPunc = null;
     if (ch == "$" || ch == "?") {
+      if(ch == "?" && stream.match(/\s/, false)){
+        return "operator";
+      }
       stream.match(/^[\w\d]*/);
       return "variable-2";
     }
@@ -69,10 +72,6 @@ CodeMirror.defineMode("sparql", function(config) {
       stream.eatWhile(/[a-z\d\-]/i);
       return "meta";
     }
-    else if (ch == "^") {
-      stream.eatWhile(/\^/);
-      return "meta";
-    }
     else {
       stream.eatWhile(/[_\w\d]/);
       if (stream.eat(":")) {

From be9e01eedbf33282fe85ebec69d026e12a6e2959 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Nov 2014 09:53:54 +0100
Subject: [PATCH 71/71] Mark version 4.8.0

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

diff --git a/AUTHORS b/AUTHORS
index c6e7505f2f..455d7e68a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ anaran
 AndersMad
 Anders Nawroth
 Anderson Mesquita
+Andrea G
 Andreas Reischuck
 Andre von Houck
 Andrey Fedorov
@@ -87,6 +88,7 @@ ComFreek
 Curtis Gagliardi
 dagsta
 daines
+Dale Jung
 Dan Heberden
 Daniel, Dao Quang Minh
 Daniele Di Sarli
@@ -145,6 +147,7 @@ Golevka
 Gordon Smith
 Grant Skinner
 greengiant
+Gregory Koberger
 Guillaume Massé
 Guillaume Massé
 Gustavo Rodrigues
@@ -177,6 +180,7 @@ jankeromnes
 Jan Keromnes
 Jan Odvarko
 Jan T. Sott
+Jared Forsyth
 Jason
 Jason Grout
 Jason Johnston
@@ -187,6 +191,7 @@ Jean Boussier
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
+Jeremy Parmenter
 Jochen Berger
 Johan Ask
 John Connor
@@ -230,6 +235,7 @@ LM
 lochel
 Lorenzo Stoakes
 Luciano Longo
+Luke Stagner
 lynschinzer
 Maksim Lin
 Maksym Taran
@@ -289,8 +295,10 @@ nextrevision
 nguillaumin
 Ng Zhi An
 Nicholas Bollweg
+Nicholas Bollweg (Nick)
 Nick Small
 Niels van Groningen
+nightwing
 Nikita Beloglazov
 Nikita Vasilyev
 Nikolay Kostov
@@ -317,6 +325,7 @@ prasanthj
 Prasanth J
 Radek Piórkowski
 Rahul
+Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
 Richard van der Meer
@@ -336,6 +345,7 @@ satchmorun
 sathyamoorthi
 SCLINIC\jdecker
 Scott Aikin
+Scott Goodhew
 Sebastian Zaha
 shaund
 shaun gilchrist
diff --git a/bower.json b/bower.json
index 2704354d73..bf28a95f87 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.7.1",
+  "version":"4.8.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index a727e45328..bab6255bb1 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.8.0;f=">4.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.7.0;f=">4.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8183fb1b84..34b7e6102a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.7.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.8.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index b50bf30ea8..8b637908a9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,18 @@
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">22-11-2014: <a href="http://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
+
+  <ul class="rel-note">
+    <li>Built-in support for <a href="manual.html#normalizeKeyMap">multi-stroke key bindings</a>.</li>
+    <li>New method: <a href="manual.html#getLineTokens"><code>getLineTokens</code></a>.</li>
+    <li>New modes: <a href="../mode/dockerfile/index.html">dockerfile</a>, <a href="../mode/idl/index.html">IDL</a>, <a href="../mode/clike/index.html">Objective C</a> (crude).</li>
+    <li>Support styling of gutter backgrounds, allow <code>"gutter"</code> styles in <a href="manual.html#addLineClass"><code>addLineClass</code></a>.</li>
+    <li>Many improvements to the <a href="../demo/vim.html">Vim mode</a>, rewritten visual mode.</li>
+    <li>Improvements to modes: <a href="../mode/gfm/index.html">gfm</a> (strikethrough), <a href="../mode/sparql/index.html">SPARQL</a> (version 1.1 support), and <a href="../mode/stex/index.html">sTeX</a> (no more runaway math mode).
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-10-2014: <a href="http://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 03b4fd6793..f2802dcdb0 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.7</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.8</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9dc7b27e08..e6011f7e66 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7916,7 +7916,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.7.1";
+  CodeMirror.version = "4.8.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index c306fa531b..fe52bcfe8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.7.1",
+    "version":"4.8.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",