116 files changed, 3186 insertions, 466 deletions

diff --git a/imports/codemirror/LICENSE b/imports/codemirror/LICENSE
index 3f7c0bb1..f62410e6 100755..100644
--- a/imports/codemirror/LICENSE
+++ b/imports/codemirror/LICENSE
@@ -17,3 +17,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+Please note that some subdirectories of the CodeMirror distribution
+include their own LICENSE files, and are released under different
+licences.
diff --git a/imports/codemirror/keymap/emacs.js b/imports/codemirror/keymap/emacs.js
index 8fd3564e..8fd3564e 100755..100644
--- a/imports/codemirror/keymap/emacs.js
+++ b/imports/codemirror/keymap/emacs.js
diff --git a/imports/codemirror/keymap/vim.js b/imports/codemirror/keymap/vim.js
index e03e0128..f8fa5e07 100755..100644
--- a/imports/codemirror/keymap/vim.js
+++ b/imports/codemirror/keymap/vim.js
@@ -1,5 +1,11 @@
 (function() {
   var count = "";
+  var sdir = "f";
+  var buf = "";
+  var yank = 0;
+  var mark = [];