fix problem where fast-polling was canceled by slow-polling

Author: marijnh

lib/codemirror.js

@@ -460,7 +460,9 @@ var CodeMirror = (function() {
       return getRange(sel.from, sel.to);
     }
 
+    var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
     function slowPoll() {
+      if (pollingFast) return;
       poll.set(2000, function() {
         startOperation();
         readInput();
@@ -470,12 +472,13 @@ var CodeMirror = (function() {
     }
     function fastPoll(keyId) {
       var missed = false;
+      pollingFast = true;
       function p() {
         startOperation();
         var changed = readInput();
         if (changed == "moved" && keyId) movementKeys[keyId] = true;
         if (!changed && !missed) {missed = true; poll.set(80, p);}
-        else slowPoll();
+        else {pollingFast = false; slowPoll();}
         endOperation();
       }
       poll.set(20, p);