codemirror 4.0.3 (new upstream major release)

applications/admin/static/codemirror/keymap/emacs.js

@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var Pos = CodeMirror.Pos;
@@ -174,7 +181,7 @@
     if (dup > 1 && event.origin == "+input") {
       var one = event.text.join("\n"), txt = "";
       for (var i = 1; i < dup; ++i) txt += one;
-      cm.replaceSelection(txt, "end", "+input");
+      cm.replaceSelection(txt);
     }
   }
 
@@ -197,7 +204,7 @@
 
   function setMark(cm) {
     cm.setCursor(cm.getCursor());
-    cm.setExtending(true);
+    cm.setExtending(!cm.getExtending());
     cm.on("change", function() { cm.setExtending(false); });
   }
 
@@ -266,7 +273,7 @@
       cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
       cm.setSelection(start, cm.getCursor());
     },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
+    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
 
     "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
@@ -323,7 +330,7 @@
       var range = cm.getRange(from, pos);
       if (range.length != 2) return;
       cm.setSelection(from, pos);
-      cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
+      cm.replaceSelection(range.charAt(1) + range.charAt(0), null, "+transpose");
     }),
 
     "Alt-C": repeated(function(cm) {
@@ -395,4 +402,4 @@
   }
   for (var i = 0; i < 10; ++i) regPrefix(String(i));
   regPrefix("-");
-})();
+});