kallithea Changeset - 01273e4f8d63

Changeset - 01273e4f8d63

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-07-05 13:39:02
marcin@python-works.com

Updated codemirror script

1 file changed with 1897 insertions and 1050 deletions:

rhodecode/public/js/codemirror.js

1897

1050

0 comments (0 inline, 0 general)

rhodecode/public/js/codemirror.js

➞

Show inline comments

@@ @@ -4,7 +4,7 @@ @@
 // CodeMirror is the only global var we claim
 var CodeMirror = (function() {
-  // This is the function that produces an editor instance. It's
+  // This is the function that produces an editor instance. Its
   // closure is used to store the editor state.
   function CodeMirror(place, givenOptions) {
     // Determine effective options based on given values and defaults.
@@ @@ -13,41 +13,65 @@ var CodeMirror = (function() { @@
       if (defaults.hasOwnProperty(opt))
         options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
     var targetDocument = options["document"];
     // The element in which the editor lives.
     var wrapper = targetDocument.createElement("div");
     wrapper.className = "CodeMirror";
     var wrapper = document.createElement("div");
     wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
     // This mess creates the base DOM structure for the editor.
     wrapper.innerHTML =
       '<div style="overflow: hidden; position: relative; width: 1px; height: 0px;">' + // Wraps and hides input textarea
         '<textarea style="position: absolute; width: 10000px;" wrap="off" ' +
       '<div style="overflow: hidden; position: relative; width: 3px; height: 0px;">' + // Wraps and hides input textarea
         '<textarea style="position: absolute; padding: 0; width: 1px; height: 1em" wrap="off" ' +
           'autocorrect="off" autocapitalize="off"></textarea></div>' +
       '<div class="CodeMirror-scroll cm-s-' + options.theme + '">' +
       '<div class="CodeMirror-scrollbar">' + // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
         '<div class="CodeMirror-scrollbar-inner">' + // The empty scrollbar content, used solely for managing the scrollbar thumb.
       '</div></div>' + // This must be before the scroll area because it's float-right.
       '<div class="CodeMirror-scroll" tabindex="-1">' +
         '<div style="position: relative">' + // Set to the height of the text, causes scrolling
           '<div style="position: absolute; height: 0; width: 0; overflow: hidden;"></div>' +
           '<div style="position: relative">' + // Moved around its parent to cover visible view
             '<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' +
             // Provides positioning relative to (visible) text origin
             '<div class="CodeMirror-lines"><div style="position: relative" draggable="true">' +
             '<div class="CodeMirror-lines"><div style="position: relative; z-index: 0">' +
               // Used to measure text size
               '<div style="position: absolute; width: 100%; height: 0; overflow: hidden; visibility: hidden;"></div>' +
               '<pre class="CodeMirror-cursor">&#160;</pre>' + // Absolutely positioned blinky cursor
               '<div></div>' + // This DIV contains the actual code
               '<pre class="CodeMirror-cursor" style="visibility: hidden">&#160;</pre>' + // Used to force a width
               '<div style="position: relative; z-index: -1"></div><div></div>' + // DIVs containing the selection and the actual code
             '</div></div></div></div></div>';
     if (place.appendChild) place.appendChild(wrapper); else place(wrapper);
     // I've never seen more elegant code in my life.
     var inputDiv = wrapper.firstChild, input = inputDiv.firstChild,
         scroller = wrapper.lastChild, code = scroller.firstChild,
         measure = code.firstChild, mover = measure.nextSibling,
         gutter = mover.firstChild, gutterText = gutter.firstChild,
         lineSpace = gutter.nextSibling.firstChild,
         cursor = lineSpace.firstChild, lineDiv = cursor.nextSibling;
     if (options.tabindex != null) input.tabindex = options.tabindex;
         mover = code.firstChild, gutter = mover.firstChild, gutterText = gutter.firstChild,
         lineSpace = gutter.nextSibling.firstChild, measure = lineSpace.firstChild,
         cursor = measure.nextSibling, widthForcer = cursor.nextSibling,
         selectionDiv = widthForcer.nextSibling, lineDiv = selectionDiv.nextSibling,
         scrollbar = inputDiv.nextSibling, scrollbarInner = scrollbar.firstChild;
     themeChanged(); keyMapChanged();
     // Needed to hide big blue blinking cursor on Mobile Safari
     if (ios) input.style.width = "0px";
     if (!webkit) scroller.draggable = true;
     lineSpace.style.outline = "none";
     if (options.tabindex != null) input.tabIndex = options.tabindex;
     if (options.autofocus) focusInput();
     if (!options.gutter && !options.lineNumbers) gutter.style.display = "none";
     // Needed to handle Tab key in KHTML
     if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute";
     // Check for OS X >= 10.7. If so, we need to force a width on the scrollbar, and
     // make it overlap the content. (But we only do this if the scrollbar doesn't already
     // have a natural width. If the mouse is plugged in or the user sets the system pref
     // to always show scrollbars, the scrollbar shouldn't overlap.)
     if (mac_geLion) {
       scrollbar.className += (overlapScrollbars() ? " cm-sb-overlap" : " cm-sb-nonoverlap");
     } else if (ie_lt8) {
       // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
       scrollbar.className += " cm-sb-ie7";
+    }
     // Check for problem with IE innerHTML not working when we have a
     // P (or similar) parent node.
     try { stringWidth("x"); }
     catch (e) {
-      if (e.message.match(/unknown runtime/i))
       if (e.message.match(/runtime/i))
         e = new Error("A CodeMirror inside a P-style element does not work in Internet Explorer. (innerHTML bug)");
       throw e;
+    }
@@ @@ -55,34 +79,32 @@ var CodeMirror = (function() { @@
     // Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
     var poll = new Delayed(), highlight = new Delayed(), blinker;
     // mode holds a mode API object. lines an array of Line objects
     // (see Line constructor), work an array of lines that should be
     // parsed, and history the undo history (instance of History
     // constructor).
     var mode, lines = [new Line("")], work, focused;
     // mode holds a mode API object. doc is the tree of Line objects,
     // work an array of lines that should be parsed, and history the
     // undo history (instance of History constructor).
     var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
     loadMode();
     // The selection. These are always maintained to point at valid
     // positions. Inverted is used to remember that the user is
     // selecting bottom-to-top.
     var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false};
     // Selection-related flags. shiftSelecting obviously tracks
     // whether the user is holding shift. reducedSelection is a hack
     // to get around the fact that we can't create inverted
     // selections. See below.
     var shiftSelecting, reducedSelection, lastClick, lastDoubleClick, draggingText;
     // whether the user is holding shift.
     var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, lastScrollLeft = 0, draggingText,
         overwrite = false, suppressEdits = false;
     // Variables used by startOperation/endOperation to track what
     // happened during the operation.
     var updateInput, changes, textChanged, selectionChanged, leaveInputAlone, gutterDirty;
     var updateInput, userSelChange, changes, textChanged, selectionChanged, leaveInputAlone,
         gutterDirty, callbacks;
     // Current visible range (may be bigger than the view window).
     var showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null;
     // editing will hold an object describing the things we put in the
     // textarea, to help figure out whether something changed.
     // bracketHighlighted is used to remember that a backet has been
     var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
     // bracketHighlighted is used to remember that a bracket has been
     // marked.
-    var editing, bracketHighlighted;
     var bracketHighlighted;
     // Tracks the maximum line length so that the horizontal scrollbar
     // can be kept static when scrolling.
     var maxLine = "", maxWidth;
     var maxLine = "", updateMaxLine = false, maxLineChanged = true;
     var tabCache = {};
     // Initialize the content.
     operation(function(){setValue(options.value || ""); updateInput = false;})();
@@ @@ -91,38 +113,53 @@ var CodeMirror = (function() { @@
     // Register our event handlers.
     connect(scroller, "mousedown", operation(onMouseDown));
     connect(scroller, "dblclick", operation(onDoubleClick));
-    connect(lineSpace, "dragstart", onDragStart);
+    connect(lineSpace, "selectstart", e_preventDefault);
     // Gecko browsers fire contextmenu *after* opening the menu, at
     // which point we can't mess with it anymore. Context menu is
     // handled in onMouseDown for Gecko.
     if (!gecko) connect(scroller, "contextmenu", onContextMenu);
     connect(scroller, "scroll", function() {
       updateDisplay([]);
       if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
       if (options.onScroll) options.onScroll(instance);
     });
     connect(scroller, "scroll", onScroll);
     connect(scrollbar, "scroll", onScroll);
     connect(scrollbar, "mousedown", function() {setTimeout(focusInput, 0);});
     connect(scroller, "mousewheel", onMouseWheel);
     connect(scroller, "DOMMouseScroll", onMouseWheel);
     connect(window, "resize", function() {updateDisplay(true);});
     connect(input, "keyup", operation(onKeyUp));
-    connect(input, "input", function() {fastPoll(curKeyId);});
     connect(input, "input", fastPoll);
     connect(input, "keydown", operation(onKeyDown));
     connect(input, "keypress", operation(onKeyPress));
     connect(input, "focus", onFocus);
     connect(input, "blur", onBlur);
     connect(scroller, "dragenter", e_stop);
     connect(scroller, "dragover", e_stop);
     connect(scroller, "drop", operation(onDrop));
     if (options.dragDrop) {
       connect(scroller, "dragstart", onDragStart);
       function drag_(e) {
         if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
         e_stop(e);
+      }
       connect(scroller, "dragenter", drag_);
       connect(scroller, "dragover", drag_);
       connect(scroller, "drop", operation(onDrop));
+    }
     connect(scroller, "paste", function(){focusInput(); fastPoll();});
     connect(input, "paste", function(){fastPoll();});
     connect(input, "cut", function(){fastPoll();});
     connect(input, "paste", fastPoll);
     connect(input, "cut", operation(function(){
       if (!options.readOnly) replaceSelection("");
     }));
     // Needed to handle Tab key in KHTML
     if (khtml) connect(code, "mouseup", function() {
         if (document.activeElement == input) input.blur();
         focusInput();
     });
     // IE throws unspecified error in certain cases, when
     // trying to access activeElement before onload
     var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { }
     if (hasFocus) setTimeout(onFocus, 20);
     var hasFocus; try { hasFocus = (document.activeElement == input); } catch(e) { }
     if (hasFocus || options.autofocus) setTimeout(onFocus, 20);
     else onBlur();
-    function isLine(l) {return l >= 0 && l < lines.length;}
+    function isLine(l) {return l >= 0 && l < doc.size;}
     // The instance object that we'll return. Mostly calls out to
     // local functions in the CodeMirror function. Some do some extra
     // range checking and/or clipping. operation is used to wrap the
@@ @@ -133,47 +170,74 @@ var CodeMirror = (function() { @@
       setValue: operation(setValue),
       getSelection: getSelection,
       replaceSelection: operation(replaceSelection),
       focus: function(){focusInput(); onFocus(); fastPoll();},
+      focus: function(){window.focus(); focusInput(); onFocus(); fastPoll();},
       setOption: function(option, value) {
         var oldVal = options[option];
         options[option] = value;
         if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber")
           operation(gutterChanged)();
         else if (option == "mode" || option == "indentUnit") loadMode();
         else if (option == "readOnly" && value == "nocursor") input.blur();
         else if (option == "theme") scroller.className = scroller.className.replace(/cm-s-\w+/, "cm-s-" + value);
         if (option == "mode" || option == "indentUnit") loadMode();
         else if (option == "readOnly" && value == "nocursor") {onBlur(); input.blur();}
         else if (option == "readOnly" && !value) {resetInput(true);}
         else if (option == "theme") themeChanged();
         else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
         else if (option == "tabSize") updateDisplay(true);
         else if (option == "keyMap") keyMapChanged();
         if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" || option == "theme") {
           gutterChanged();
           updateDisplay(true);
+        }
       },
       getOption: function(option) {return options[option];},
       undo: operation(undo),
       redo: operation(redo),
       indentLine: operation(function(n, dir) {
         if (isLine(n)) indentLine(n, dir == null ? "smart" : dir ? "add" : "subtract");
         if (typeof dir != "string") {
           if (dir == null) dir = options.smartIndent ? "smart" : "prev";
           else dir = dir ? "add" : "subtract";
+        }
         if (isLine(n)) indentLine(n, dir);
       }),
       indentSelection: operation(indentSelected),
       historySize: function() {return {undo: history.done.length, redo: history.undone.length};},
       clearHistory: function() {history = new History();},
       matchBrackets: operation(function(){matchBrackets(true);}),
       getTokenAt: function(pos) {
+      getTokenAt: operation(function(pos) {
         pos = clipPos(pos);
         return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch);
       },
         return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), pos.ch);
       }),
       getStateAfter: function(line) {
-        line = clipLine(line == null ? lines.length - 1: line);
+        line = clipLine(line == null ? doc.size - 1: line);
         return getStateBefore(line + 1);
       },
       cursorCoords: function(start){
+      cursorCoords: function(start, mode) {
         if (start == null) start = sel.inverted;
-        return pageCoords(start ? sel.from : sel.to);
+        return this.charCoords(start ? sel.from : sel.to, mode);
       },
       charCoords: function(pos){return pageCoords(clipPos(pos));},
       charCoords: function(pos, mode) {
         pos = clipPos(pos);
         if (mode == "local") return localCoords(pos, false);
         if (mode == "div") return localCoords(pos, true);
         return pageCoords(pos);
       },
       coordsChar: function(coords) {
         var off = eltOffset(lineSpace);
         var line = clipLine(Math.min(lines.length - 1, showingFrom + Math.floor((coords.y - off.top) / lineHeight())));
         return clipPos({line: line, ch: charFromX(clipLine(line), coords.x - off.left)});
         return coordsChar(coords.x - off.left, coords.y - off.top);
       },
       getSearchCursor: function(query, pos, caseFold) {return new SearchCursor(query, pos, caseFold);},
       markText: operation(markText),
       setBookmark: setBookmark,
       findMarksAt: findMarksAt,
       setMarker: operation(addGutterMarker),
       clearMarker: operation(removeGutterMarker),
       setLineClass: operation(setLineClass),
       hideLine: operation(function(h) {return setLineHidden(h, true);}),
       showLine: operation(function(h) {return setLineHidden(h, false);}),
       onDeleteLine: function(line, f) {
         if (typeof line == "number") {
           if (!isLine(line)) return null;
           line = getLine(line);
+        }
         (line.handlers || (line.handlers = [])).push(f);
         return line;
       },
       lineInfo: lineInfo,
       addWidget: function(pos, node, scroll, vert, horiz) {
         pos = localCoords(clipPos(pos));
@@ @@ -182,7 +246,7 @@ var CodeMirror = (function() { @@
         code.appendChild(node);
         if (vert == "over") top = pos.y;
         else if (vert == "near") {
-          var vspace = Math.max(scroller.offsetHeight, lines.length * lineHeight()),
+          var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
               hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft();
           if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
             top = pos.y - node.offsetHeight;
@@ @@ -203,20 +267,24 @@ var CodeMirror = (function() { @@
           scrollIntoView(left, top, left + node.offsetWidth, top + node.offsetHeight);
       },
       lineCount: function() {return lines.length;},
       lineCount: function() {return doc.size;},
       clipPos: clipPos,
       getCursor: function(start) {
         if (start == null) start = sel.inverted;
         return copyPos(start ? sel.from : sel.to);
       },
       somethingSelected: function() {return !posEq(sel.from, sel.to);},
       setCursor: operation(function(line, ch) {
         if (ch == null && typeof line.line == "number") setCursor(line.line, line.ch);
         else setCursor(line, ch);
       setCursor: operation(function(line, ch, user) {
         if (ch == null && typeof line.line == "number") setCursor(line.line, line.ch, user);
         else setCursor(line, ch, user);
       }),
       setSelection: operation(function(from, to) {setSelection(clipPos(from), clipPos(to || from));}),
       getLine: function(line) {if (isLine(line)) return lines[line].text;},
       setSelection: operation(function(from, to, user) {
         (user ? setSelectionUser : setSelection)(clipPos(from), clipPos(to || from));
       }),
       getLine: function(line) {if (isLine(line)) return getLine(line).text;},
       getLineHandle: function(line) {if (isLine(line)) return getLine(line);},
       setLine: operation(function(line, text) {
-        if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+        if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: getLine(line).text.length});
       }),
       removeLine: operation(function(line) {
         if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0}));
@@ @@ -224,44 +292,99 @@ var CodeMirror = (function() { @@
       replaceRange: operation(replaceRange),
       getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));},
       coordsFromIndex: function(index) {
         var total = lines.length, pos = 0, line, ch, len;
         for (line = 0; line < total; line++) {
           len = lines[line].text.length + 1;
           if (pos + len > index) { ch = index - pos; break; }
           pos += len;
       triggerOnKeyDown: operation(onKeyDown),
       execCommand: function(cmd) {return commands[cmd](instance);},
       // Stuff used by commands, probably not much use to outside code.
       moveH: operation(moveH),
       deleteH: operation(deleteH),
       moveV: operation(moveV),
       toggleOverwrite: function() {
         if(overwrite){
           overwrite = false;
           cursor.className = cursor.className.replace(" CodeMirror-overwrite", "");
         } else {
           overwrite = true;
           cursor.className += " CodeMirror-overwrite";
+        }
         return clipPos({line: line, ch: ch});
       },
       posFromIndex: function(off) {
         var lineNo = 0, ch;
         doc.iter(0, doc.size, function(line) {
           var sz = line.text.length + 1;
           if (sz > off) { ch = off; return true; }
           off -= sz;
           ++lineNo;
         });
         return clipPos({line: lineNo, ch: ch});
       },
       indexFromPos: function (coords) {
         if (coords.line < 0 || coords.ch < 0) return 0;
         var index = coords.ch;
         doc.iter(0, coords.line, function (line) {
           index += line.text.length + 1;
         });
         return index;
       },
       scrollTo: function(x, y) {
         if (x != null) scroller.scrollLeft = x;
         if (y != null) scrollbar.scrollTop = y;
         updateDisplay([]);
       },
       getScrollInfo: function() {
         return {x: scroller.scrollLeft, y: scrollbar.scrollTop,
                 height: scrollbar.scrollHeight, width: scroller.scrollWidth};
       },
       operation: function(f){return operation(f)();},
       refresh: function(){updateDisplay(true);},
       compoundChange: function(f){return compoundChange(f);},
       refresh: function(){
         updateDisplay(true);
         if (scrollbar.scrollHeight > lastScrollTop)
           scrollbar.scrollTop = lastScrollTop;
       },
       getInputField: function(){return input;},
       getWrapperElement: function(){return wrapper;},
       getScrollerElement: function(){return scroller;},
       getGutterElement: function(){return gutter;}
     };
     function getLine(n) { return getLineAt(doc, n); }
     function updateLineHeight(line, height) {
       gutterDirty = true;
       var diff = height - line.height;
       for (var n = line; n; n = n.parent) n.height += diff;
+    }
     function setValue(code) {
       var top = {line: 0, ch: 0};
-      updateLines(top, {line: lines.length - 1, ch: lines[lines.length-1].text.length},
+      updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
                   splitLines(code), top, top);
       updateInput = true;
+    }
-    function getValue(code) {
     function getValue() {
       var text = [];
       for (var i = 0, l = lines.length; i < l; ++i)
         text.push(lines[i].text);
       doc.iter(0, doc.size, function(line) { text.push(line.text); });
       return text.join("\n");
+    }
     function onScroll(e) {
       if (lastScrollTop != scrollbar.scrollTop || lastScrollLeft != scroller.scrollLeft) {
         lastScrollTop = scrollbar.scrollTop;
         lastScrollLeft = scroller.scrollLeft;
         updateDisplay([]);
         if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
         if (options.onScroll) options.onScroll(instance);
+      }
+    }
     function onMouseDown(e) {
       setShift(e_prop(e, "shiftKey"));
       // Check whether this is a click in a widget
       for (var n = e_target(e); n != wrapper; n = n.parentNode)
         if (n.parentNode == code && n != mover) return;
-      // First, see if this is a click in the gutter
+      // See if this is a click in the gutter
       for (var n = e_target(e); n != wrapper; n = n.parentNode)
         if (n.parentNode == gutterText) {
           if (options.onGutterClick)
@@ @@ -277,6 +400,8 @@ var CodeMirror = (function() { @@
         return;
       case 2:
         if (start) setCursor(start.line, start.ch, true);
         setTimeout(focusInput, 20);
         e_preventDefault(e);
         return;
+      }
       // For button 1, if it was clicked inside the editor
@@ @@ -287,29 +412,36 @@ var CodeMirror = (function() { @@
       if (!focused) onFocus();
       var now = +new Date;
       if (lastDoubleClick > now - 400) {
+      if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
         e_preventDefault(e);
         setTimeout(focusInput, 20);
         return selectLine(start.line);
       } else if (lastClick > now - 400) {
         lastDoubleClick = now;
       } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
         lastDoubleClick = {time: now, pos: start};
         e_preventDefault(e);
         return selectWordAt(start);
       } else { lastClick = now; }
+      } else { lastClick = {time: now, pos: start}; }
       var last = start, going;
       if (dragAndDrop && !posEq(sel.from, sel.to) &&
+      if (options.dragDrop && dragAndDrop && !options.readOnly && !posEq(sel.from, sel.to) &&
           !posLess(start, sel.from) && !posLess(sel.to, start)) {
         // Let the drag handler handle this.
         var up = connect(targetDocument, "mouseup", operation(function(e2) {
         if (webkit) scroller.draggable = true;
         function dragEnd(e2) {
           if (webkit) scroller.draggable = false;
           draggingText = false;
           up();
+          up(); drop();
           if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
             e_preventDefault(e2);
             setCursor(start.line, start.ch, true);
             focusInput();
+          }
         }), true);
+        }
         var up = connect(document, "mouseup", operation(dragEnd), true);
         var drop = connect(scroller, "drop", operation(dragEnd), true);
         draggingText = true;
         // IE's approach to draggable
         if (scroller.dragDrop) scroller.dragDrop();
         return;
+      }
       e_preventDefault(e);
@@ @@ -328,12 +460,7 @@ var CodeMirror = (function() { @@
+        }
+      }
       var move = connect(targetDocument, "mousemove", operation(function(e) {
         clearTimeout(going);
         e_preventDefault(e);
         extend(e);
       }), true);
       var up = connect(targetDocument, "mouseup", operation(function(e) {
       function done(e) {
         clearTimeout(going);
         var cur = posFromMouse(e);
         if (cur) setSelectionUser(start, cur);
@@ @@ -341,16 +468,26 @@ var CodeMirror = (function() { @@
         focusInput();
         updateInput = true;
         move(); up();
+      }
       var move = connect(document, "mousemove", operation(function(e) {
         clearTimeout(going);
         e_preventDefault(e);
         if (!ie && !e_button(e)) done(e);
         else extend(e);
       }), true);
       var up = connect(document, "mouseup", operation(done), true);
+    }
     function onDoubleClick(e) {
       for (var n = e_target(e); n != wrapper; n = n.parentNode)
         if (n.parentNode == gutterText) return e_preventDefault(e);
       var start = posFromMouse(e);
       if (!start) return;
       lastDoubleClick = +new Date;
+      lastDoubleClick = {time: +new Date, pos: start};
       e_preventDefault(e);
       selectWordAt(start);
+    }
     function onDrop(e) {
       if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
       e.preventDefault();
       var pos = posFromMouse(e, true), files = e.dataTransfer.files;
       if (!pos || options.readOnly) return;
@@ @@ -360,102 +497,147 @@ var CodeMirror = (function() { @@
           reader.onload = function() {
             text[i] = reader.result;
             if (++read == n) {
 	      pos = clipPos(pos);
 	      var end = replaceRange(text.join(""), pos, pos);
 	      setSelectionUser(pos, end);
+	    }
               pos = clipPos(pos);
               operation(function() {
                 var end = replaceRange(text.join(""), pos, pos);
                 setSelectionUser(pos, end);
               })();
+            }
           };
           reader.readAsText(file);
+        }
         var n = files.length, text = Array(n), read = 0;
         for (var i = 0; i < n; ++i) loadFile(files[i], i);
+      }
       else {
       } else {
         // Don't do a replace if the drop happened inside of the selected text.
         if (draggingText && !(posLess(pos, sel.from) || posLess(sel.to, pos))) return;
         try {
           var text = e.dataTransfer.getData("Text");
           if (text) {
 	    var end = replaceRange(text, pos, pos);
 	    var curFrom = sel.from, curTo = sel.to;
 	    setSelectionUser(pos, end);
             if (draggingText) replaceRange("", curFrom, curTo);
 	    focusInput();
+	  }
             compoundChange(function() {
               var curFrom = sel.from, curTo = sel.to;
               setSelectionUser(pos, pos);
               if (draggingText) replaceRange("", curFrom, curTo);
               replaceSelection(text);
               focusInput();
             });
+          }
+        }
         catch(e){}
+      }
+    }
     function onDragStart(e) {
       var txt = getSelection();
       // This will reset escapeElement
       htmlEscape(txt);
       e.dataTransfer.setDragImage(escapeElement, 0, 0);
       e.dataTransfer.setData("Text", txt);
       // Use dummy image instead of default browsers image.
       if (gecko || chrome || opera) {
         var img = document.createElement('img');
         img.scr = 'data:image/gif;base64,R0lGODdhAgACAIAAAAAAAP///ywAAAAAAgACAAACAoRRADs='; //1x1 image
         e.dataTransfer.setDragImage(img, 0, 0);
+      }
+    }
     function doHandleBinding(bound, dropShift) {
       if (typeof bound == "string") {
         bound = commands[bound];
         if (!bound) return false;
+      }
       var prevShift = shiftSelecting;
       try {
         if (options.readOnly) suppressEdits = true;
         if (dropShift) shiftSelecting = null;
         bound(instance);
       } catch(e) {
         if (e != Pass) throw e;
         return false;
       } finally {
         shiftSelecting = prevShift;
         suppressEdits = false;
+      }
       return true;
+    }
     function handleKeyBinding(e) {
       // Handle auto keymap transitions
       var startMap = getKeyMap(options.keyMap), next = startMap.auto;
       clearTimeout(maybeTransition);
       if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
         if (getKeyMap(options.keyMap) == startMap) {
           options.keyMap = (next.call ? next.call(null, instance) : next);
+        }
       }, 50);
       var name = keyNames[e_prop(e, "keyCode")], handled = false;
       if (name == null || e.altGraphKey) return false;
       if (e_prop(e, "altKey")) name = "Alt-" + name;
       if (e_prop(e, "ctrlKey")) name = "Ctrl-" + name;
       if (e_prop(e, "metaKey")) name = "Cmd-" + name;
       var stopped = false;
       function stop() { stopped = true; }
       if (e_prop(e, "shiftKey")) {
         handled = lookupKey("Shift-" + name, options.extraKeys, options.keyMap,
                             function(b) {return doHandleBinding(b, true);}, stop)
                || lookupKey(name, options.extraKeys, options.keyMap, function(b) {
                  if (typeof b == "string" && /^go[A-Z]/.test(b)) return doHandleBinding(b);
                }, stop);
       } else {
         handled = lookupKey(name, options.extraKeys, options.keyMap, doHandleBinding, stop);
+      }
       if (stopped) handled = false;
       if (handled) {
         e_preventDefault(e);
         restartBlink();
         if (ie) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
+      }
       return handled;
+    }
     function handleCharBinding(e, ch) {
       var handled = lookupKey("'" + ch + "'", options.extraKeys,
                               options.keyMap, function(b) { return doHandleBinding(b, true); });
       if (handled) {
         e_preventDefault(e);
         restartBlink();
+      }
       return handled;
+    }
     var lastStoppedKey = null, maybeTransition;
     function onKeyDown(e) {
       if (!focused) onFocus();
       var code = e.keyCode;
       if (ie && e.keyCode == 27) { e.returnValue = false; }
       if (pollingFast) { if (readInput()) pollingFast = false; }
       if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
       var code = e_prop(e, "keyCode");
       // IE does strange things with escape.
       if (ie && code == 27) { e.returnValue = false; }
       // Tries to detect ctrl on non-mac, cmd on mac.
       var mod = (mac ? e.metaKey : e.ctrlKey) && !e.altKey, anyMod = e.ctrlKey || e.altKey || e.metaKey;
       if (code == 16 || e.shiftKey) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from);
       else shiftSelecting = null;
       setShift(code == 16 || e_prop(e, "shiftKey"));
       // First give onKeyEvent option a chance to handle this.
       if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
       if (code == 33 || code == 34) {scrollPage(code == 34); return e_preventDefault(e);} // page up/down
       if (mod && ((code == 36 || code == 35) || // ctrl-home/end
                   mac && (code == 38 || code == 40))) { // cmd-up/down
         scrollEnd(code == 36 || code == 38); return e_preventDefault(e);
       var handled = handleKeyBinding(e);
       if (opera) {
         lastStoppedKey = handled ? code : null;
         // Opera has no cut event... we try to at least catch the key combo
         if (!handled && code == 88 && e_prop(e, mac ? "metaKey" : "ctrlKey"))
           replaceSelection("");
+      }
       if (mod && code == 65) {selectAll(); return e_preventDefault(e);} // ctrl-a
       if (!options.readOnly) {
         if (!anyMod && code == 13) {return;} // enter
         if (!anyMod && code == 9 && handleTab(e.shiftKey)) return e_preventDefault(e); // tab
         if (mod && code == 90) {undo(); return e_preventDefault(e);} // ctrl-z
         if (mod && ((e.shiftKey && code == 90) || code == 89)) {redo(); return e_preventDefault(e);} // ctrl-shift-z, ctrl-y
+    }
     function onKeyPress(e) {
       if (pollingFast) readInput();
       if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
       var keyCode = e_prop(e, "keyCode"), charCode = e_prop(e, "charCode");
       if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
       if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(e)) return;
       var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
       if (options.electricChars && mode.electricChars && options.smartIndent && !options.readOnly) {
         if (mode.electricChars.indexOf(ch) > -1)
           setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 75);
+      }
       if (code == 36) { if (options.smartHome) { smartHome(); return e_preventDefault(e); } }
       // Key id to use in the movementKeys map. We also pass it to
       // fastPoll in order to 'self learn'. We need this because
       // reducedSelection, the hack where we collapse the selection to
       // its start when it is inverted and a movement key is pressed
       // (and later restore it again), shouldn't be used for
       // non-movement keys.
       curKeyId = (mod ? "c" : "") + (e.altKey ? "a" : "") + code;
       if (sel.inverted && movementKeys[curKeyId] === true) {
         var range = selRange(input);
         if (range) {
           reducedSelection = {anchor: range.start};
           setSelRange(input, range.start, range.start);
+        }
+      }
       // Don't save the key as a movementkey unless it had a modifier
       if (!mod && !e.altKey) curKeyId = null;
       fastPoll(curKeyId);
       if (handleCharBinding(e, ch)) return;
       fastPoll();
+    }
     function onKeyUp(e) {
       if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
       if (reducedSelection) {
         reducedSelection = null;
         updateInput = true;
+      }
       if (e.keyCode == 16) shiftSelecting = null;
+    }
     function onKeyPress(e) {
       if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return;
       if (options.electricChars && mode.electricChars) {
         var ch = String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode);
         if (mode.electricChars.indexOf(ch) > -1)
           setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 50);
+      }
       var code = e.keyCode;
       // Re-stop tab and enter. Necessary on some browsers.
       if (code == 13) {if (!options.readOnly) handleEnter(); e_preventDefault(e);}
       else if (!e.ctrlKey && !e.altKey && !e.metaKey && code == 9 && options.tabMode != "default") e_preventDefault(e);
       else fastPoll(curKeyId);
       if (e_prop(e, "keyCode") == 16) shiftSelecting = null;
+    }
     function onFocus() {
@@ @@ -463,9 +645,9 @@ var CodeMirror = (function() { @@
       if (!focused) {
         if (options.onFocus) options.onFocus(instance);
         focused = true;
         if (wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
           wrapper.className += " CodeMirror-focused";
         if (!leaveInputAlone) prepareInput();
         if (scroller.className.search(/\bCodeMirror-focused\b/) == -1)
           scroller.className += " CodeMirror-focused";
         if (!leaveInputAlone) resetInput(true);
+      }
       slowPoll();
       restartBlink();
@@ @@ -474,90 +656,149 @@ var CodeMirror = (function() { @@
       if (focused) {
         if (options.onBlur) options.onBlur(instance);
         focused = false;
         wrapper.className = wrapper.className.replace(" CodeMirror-focused", "");
         if (bracketHighlighted)
           operation(function(){
             if (bracketHighlighted) { bracketHighlighted(); bracketHighlighted = null; }
           })();
         scroller.className = scroller.className.replace(" CodeMirror-focused", "");
+      }
       clearInterval(blinker);
       setTimeout(function() {if (!focused) shiftSelecting = null;}, 150);
+    }
     function chopDelta(delta) {
       // Make sure we always scroll a little bit for any nonzero delta.
       if (delta > 0.0 && delta < 1.0) return 1;
       else if (delta > -1.0 && delta < 0.0) return -1;
       else return Math.round(delta);
+    }
     function onMouseWheel(e) {
       var deltaX = 0, deltaY = 0;
       if (e.type == "DOMMouseScroll") { // Firefox
         var delta = -e.detail * 8.0;
         if (e.axis == e.HORIZONTAL_AXIS) deltaX = delta;
         else if (e.axis == e.VERTICAL_AXIS) deltaY = delta;
       } else if (e.wheelDeltaX !== undefined && e.wheelDeltaY !== undefined) { // WebKit
         deltaX = e.wheelDeltaX / 3.0;
         deltaY = e.wheelDeltaY / 3.0;
       } else if (e.wheelDelta !== undefined) { // IE or Opera
         deltaY = e.wheelDelta / 3.0;
+      }
       var scrolled = false;
       deltaX = chopDelta(deltaX);
       deltaY = chopDelta(deltaY);
       if ((deltaX > 0 && scroller.scrollLeft > 0) ||
           (deltaX < 0 && scroller.scrollLeft + scroller.clientWidth < scroller.scrollWidth)) {
         scroller.scrollLeft -= deltaX;
         scrolled = true;
+      }
       if ((deltaY > 0 && scrollbar.scrollTop > 0) ||
           (deltaY < 0 && scrollbar.scrollTop + scrollbar.clientHeight < scrollbar.scrollHeight)) {
         scrollbar.scrollTop -= deltaY;
         scrolled = true;
+      }
       if (scrolled) e_stop(e);
+    }
     // Replace the range from from to to by the strings in newText.
     // Afterwards, set the selection to selFrom, selTo.
     function updateLines(from, to, newText, selFrom, selTo) {
       if (suppressEdits) return;
       if (history) {
         var old = [];
-        for (var i = from.line, e = to.line + 1; i < e; ++i) old.push(lines[i].text);
+        doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
         history.addChange(from.line, newText.length, old);
         while (history.done.length > options.undoDepth) history.done.shift();
+      }
       updateLinesNoUndo(from, to, newText, selFrom, selTo);
+    }
     function unredoHelper(from, to) {
       var change = from.pop();
       if (change) {
       if (!from.length) return;
       var set = from.pop(), out = [];
       for (var i = set.length - 1; i >= 0; i -= 1) {
         var change = set[i];
         var replaced = [], end = change.start + change.added;
         for (var i = change.start; i < end; ++i) replaced.push(lines[i].text);
         to.push({start: change.start, added: change.old.length, old: replaced});
         var pos = clipPos({line: change.start + change.old.length - 1,
                            ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])});
         updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos);
         updateInput = true;
         doc.iter(change.start, end, function(line) { replaced.push(line.text); });
         out.push({start: change.start, added: change.old.length, old: replaced});
         var pos = {line: change.start + change.old.length - 1,
                    ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])};
         updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
+      }
       updateInput = true;
       to.push(out);
+    }
     function undo() {unredoHelper(history.done, history.undone);}
     function redo() {unredoHelper(history.undone, history.done);}
     function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
       if (suppressEdits) return;
       var recomputeMaxLength = false, maxLineLength = maxLine.length;
       for (var i = from.line; i <= to.line; ++i) {
         if (lines[i].text.length == maxLineLength) {recomputeMaxLength = true; break;}
+      }
       if (!options.lineWrapping)
         doc.iter(from.line, to.line + 1, function(line) {
           if (!line.hidden && line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
         });
       if (from.line != to.line || newText.length > 1) gutterDirty = true;
-      var nlines = to.line - from.line, firstLine = lines[from.line], lastLine = lines[to.line];
+      var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
       // First adjust the line structure, taking some care to leave highlighting intact.
       if (firstLine == lastLine) {
       if (from.ch == 0 && to.ch == 0 && newText[newText.length - 1] == "") {
         // This is a whole-line replace. Treated specially to make
         // sure line objects move the way they are supposed to.
         var added = [], prevLine = null;
         if (from.line) {
           prevLine = getLine(from.line - 1);
           prevLine.fixMarkEnds(lastLine);
         } else lastLine.fixMarkStarts();
         for (var i = 0, e = newText.length - 1; i < e; ++i)
           added.push(Line.inheritMarks(newText[i], prevLine));
         if (nlines) doc.remove(from.line, nlines, callbacks);
         if (added.length) doc.insert(from.line, added);
       } else if (firstLine == lastLine) {
         if (newText.length == 1)
           firstLine.replace(from.ch, to.ch, newText[0]);
         else {
           lastLine = firstLine.split(to.ch, newText[newText.length-1]);
           var spliceargs = [from.line + 1, nlines];
           firstLine.replace(from.ch, null, newText[0]);
           firstLine.fixMarkEnds(lastLine);
           var added = [];
           for (var i = 1, e = newText.length - 1; i < e; ++i)
             spliceargs.push(Line.inheritMarks(newText[i], firstLine));
           spliceargs.push(lastLine);
           lines.splice.apply(lines, spliceargs);
             added.push(Line.inheritMarks(newText[i], firstLine));
           added.push(lastLine);
           doc.insert(from.line + 1, added);
+        }
+      }
       else if (newText.length == 1) {
       } else if (newText.length == 1) {
         firstLine.replace(from.ch, null, newText[0]);
         lastLine.replace(null, to.ch, "");
         firstLine.append(lastLine);
         lines.splice(from.line + 1, nlines);
+      }
       else {
         var spliceargs = [from.line + 1, nlines - 1];
         doc.remove(from.line + 1, nlines, callbacks);
       } else {
         var added = [];
         firstLine.replace(from.ch, null, newText[0]);
         lastLine.replace(null, to.ch, newText[newText.length-1]);
         firstLine.fixMarkEnds(lastLine);
         for (var i = 1, e = newText.length - 1; i < e; ++i)
           spliceargs.push(Line.inheritMarks(newText[i], firstLine));
         lines.splice.apply(lines, spliceargs);
           added.push(Line.inheritMarks(newText[i], firstLine));
         if (nlines > 1) doc.remove(from.line + 1, nlines - 1, callbacks);
         doc.insert(from.line + 1, added);
+      }
       for (var i = from.line, e = i + newText.length; i < e; ++i) {
         var l = lines[i].text;
         if (l.length > maxLineLength) {
           maxLine = l; maxLineLength = l.length; maxWidth = null;
           recomputeMaxLength = false;
+        }
+      }
       if (recomputeMaxLength) {
         maxLineLength = 0; maxLine = ""; maxWidth = null;
         for (var i = 0, e = lines.length; i < e; ++i) {
           var l = lines[i].text;
           if (l.length > maxLineLength) {
             maxLineLength = l.length; maxLine = l;
       if (options.lineWrapping) {
         var perLine = Math.max(5, scroller.clientWidth / charWidth() - 3);
         doc.iter(from.line, from.line + newText.length, function(line) {
           if (line.hidden) return;
           var guess = Math.ceil(line.text.length / perLine) || 1;
           if (guess != line.height) updateLineHeight(line, guess);
         });
       } else {
         doc.iter(from.line, from.line + newText.length, function(line) {
           var l = line.text;
           if (!line.hidden && l.length > maxLineLength) {
             maxLine = l; maxLineLength = l.length; maxLineChanged = true;
             recomputeMaxLength = false;
+          }
+        }
         });
         if (recomputeMaxLength) updateMaxLine = true;
+      }
       // Add these lines to the work array, so that they will be
@@ @@ -568,24 +809,64 @@ var CodeMirror = (function() { @@
         if (task < from.line) newWork.push(task);
         else if (task > to.line) newWork.push(task + lendiff);
+      }
       if (newText.length < 5) {
         highlightLines(from.line, from.line + newText.length);
         newWork.push(from.line + newText.length);
       } else {
         newWork.push(from.line);
+      }
       var hlEnd = from.line + Math.min(newText.length, 500);
       highlightLines(from.line, hlEnd);
       newWork.push(hlEnd);
       work = newWork;
       startWorker(100);
       // Remember that these lines changed, for updating the display
       changes.push({from: from.line, to: to.line + 1, diff: lendiff});
       textChanged = {from: from, to: to, text: newText};
       var changeObj = {from: from, to: to, text: newText};
       if (textChanged) {
         for (var cur = textChanged; cur.next; cur = cur.next) {}
         cur.next = changeObj;
       } else textChanged = changeObj;
       // Update the selection
       function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;}
       setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line));
       setSelection(clipPos(selFrom), clipPos(selTo),
                    updateLine(sel.from.line), updateLine(sel.to.line));
+    }
       // Make sure the scroll-size div has the correct height.
       code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
     function updateVerticalScroll(scrollTop) {
       var th = textHeight(), virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
       scrollbar.style.height = scrollbarHeight + "px";
       if (scroller.clientHeight)
         scrollbarInner.style.height = virtualHeight + "px";
       // Position the mover div to align with the current virtual scroll position
       if (scrollTop != null) scrollbar.scrollTop = scrollTop;
       mover.style.top = (displayOffset * th - scrollbar.scrollTop) + "px";
       scrollbar.style.display = (virtualHeight > scrollbarHeight) ? "block" : "none";
+    }
     // On Mac OS X Lion and up, detect whether the mouse is plugged in by measuring
     // the width of a div with a scrollbar in it. If the width is <= 1, then
     // the mouse isn't plugged in and scrollbars should overlap the content.
     function overlapScrollbars() {
       var tmpSb = document.createElement('div'),
           tmpSbInner = document.createElement('div');
       tmpSb.className = "CodeMirror-scrollbar";
       tmpSb.style.cssText = "position: absolute; left: -9999px; height: 100px;";
       tmpSbInner.className = "CodeMirror-scrollbar-inner";
       tmpSbInner.style.height = "200px";
       tmpSb.appendChild(tmpSbInner);
       document.body.appendChild(tmpSb);
       var result = (tmpSb.offsetWidth <= 1);
       document.body.removeChild(tmpSb);
       return result;
+    }
     function computeMaxLength() {
       var maxLineLength = 0;
       maxLine = ""; maxLineChanged = true;
       doc.iter(0, doc.size, function(line) {
         var l = line.text;
         if (!line.hidden && l.length > maxLineLength) {
           maxLineLength = l.length; maxLine = l;
+        }
       });
       updateMaxLine = false;
+    }
     function replaceRange(code, from, to) {
@@ @@ -623,10 +904,10 @@ var CodeMirror = (function() { @@
     function getRange(from, to) {
       var l1 = from.line, l2 = to.line;
       if (l1 == l2) return lines[l1].text.slice(from.ch, to.ch);
       var code = [lines[l1].text.slice(from.ch)];
       for (var i = l1 + 1; i < l2; ++i) code.push(lines[i].text);
       code.push(lines[l2].text.slice(0, to.ch));
       if (l1 == l2) return getLine(l1).text.slice(from.ch, to.ch);
       var code = [getLine(l1).text.slice(from.ch)];
       doc.iter(l1 + 1, l2, function(line) { code.push(line.text); });
       code.push(getLine(l2).text.slice(0, to.ch));
       return code.join("\n");
+    }
     function getSelection() {
@@ @@ -636,115 +917,56 @@ var CodeMirror = (function() { @@
     var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
     function slowPoll() {
       if (pollingFast) return;
-      poll.set(2000, function() {
+      poll.set(options.pollInterval, function() {
         startOperation();
         readInput();
         if (focused) slowPoll();
         endOperation();
       });
+    }
-    function fastPoll(keyId) {
     function fastPoll() {
       var missed = false;
       pollingFast = true;
       function p() {
         startOperation();
         var changed = readInput();
         if (changed && keyId) {
           if (changed == "moved" && movementKeys[keyId] == null) movementKeys[keyId] = true;
           if (changed == "changed") movementKeys[keyId] = false;
+        }
         if (!changed && !missed) {missed = true; poll.set(80, p);}
         if (!changed && !missed) {missed = true; poll.set(60, p);}
         else {pollingFast = false; slowPoll();}
         endOperation();
+      }
       poll.set(20, p);
+    }
     // Inspects the textarea, compares its state (content, selection)
     // to the data in the editing variable, and updates the editor
     // content or cursor if something changed.
     // Previnput is a hack to work with IME. If we reset the textarea
     // on every change, that breaks IME. So we look for changes
     // compared to the previous content instead. (Modern browsers have
     // events that indicate IME taking place, but these are not widely
     // supported or compatible enough yet to rely on.)
     var prevInput = "";
     function readInput() {
       if (leaveInputAlone || !focused) return;
       var changed = false, text = input.value, sr = selRange(input);
       if (!sr) return false;
       var changed = editing.text != text, rs = reducedSelection;
       var moved = changed || sr.start != editing.start || sr.end != (rs ? editing.start : editing.end);
       if (!moved && !rs) return false;
       if (changed) {
         shiftSelecting = reducedSelection = null;
         if (options.readOnly) {updateInput = true; return "changed";}
+      }
       // Compute selection start and end based on start/end offsets in textarea
       function computeOffset(n, startLine) {
         var pos = 0;
         for (;;) {
           var found = text.indexOf("\n", pos);
           if (found == -1 || (text.charAt(found-1) == "\r" ? found - 1 : found) >= n)
             return {line: startLine, ch: n - pos};
           ++startLine;
           pos = found + 1;
+        }
+      }
       var from = computeOffset(sr.start, editing.from),
           to = computeOffset(sr.end, editing.from);
       // Here we have to take the reducedSelection hack into account,
       // so that you can, for example, press shift-up at the start of
       // your selection and have the right thing happen.
       if (rs) {
         var head = sr.start == rs.anchor ? to : from;
         var tail = shiftSelecting ? sel.to : sr.start == rs.anchor ? from : to;
         if (sel.inverted = posLess(head, tail)) { from = head; to = tail; }
         else { reducedSelection = null; from = tail; to = head; }
+      }
       // In some cases (cursor on same line as before), we don't have
       // to update the textarea content at all.
       if (from.line == to.line && from.line == sel.from.line && from.line == sel.to.line && !shiftSelecting)
         updateInput = false;
       // Magic mess to extract precise edited range from the changed
       // string.
       if (changed) {
         var start = 0, end = text.length, len = Math.min(end, editing.text.length);
         var c, line = editing.from, nl = -1;
         while (start < len && (c = text.charAt(start)) == editing.text.charAt(start)) {
           ++start;
           if (c == "\n") {line++; nl = start;}
+        }
         var ch = nl > -1 ? start - nl : start, endline = editing.to - 1, edend = editing.text.length;
         for (;;) {
           c = editing.text.charAt(edend);
           if (text.charAt(end) != c) {++end; ++edend; break;}
           if (c == "\n") endline--;
           if (edend <= start || end <= start) break;
           --end; --edend;
+        }
         var nl = editing.text.lastIndexOf("\n", edend - 1), endch = nl == -1 ? edend : edend - nl - 1;
         updateLines({line: line, ch: ch}, {line: endline, ch: endch}, splitLines(text.slice(start, end)), from, to);
         if (line != endline || from.line != line) updateInput = true;
+      }
       else setSelection(from, to);
       editing.text = text; editing.start = sr.start; editing.end = sr.end;
       return changed ? "changed" : moved ? "moved" : false;
       if (leaveInputAlone || !focused || hasSelection(input) || options.readOnly) return false;
       var text = input.value;
       if (text == prevInput) return false;
       shiftSelecting = null;
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput[same] == text[same]) ++same;
       if (same < prevInput.length)
         sel.from = {line: sel.from.line, ch: sel.from.ch - (prevInput.length - same)};
       else if (overwrite && posEq(sel.from, sel.to))
         sel.to = {line: sel.to.line, ch: Math.min(getLine(sel.to.line).text.length, sel.to.ch + (text.length - same))};
       replaceSelection(text.slice(same), "end");
       if (text.length > 1000) { input.value = prevInput = ""; }
       else prevInput = text;
       return true;
+    }
     function resetInput(user) {
       if (!posEq(sel.from, sel.to)) {
         prevInput = "";
         input.value = getSelection();
         selectInput(input);
       } else if (user) prevInput = input.value = "";
+    }
     // Set the textarea content and selection range to match the
     // editor state.
     function prepareInput() {
       var text = [];
       var from = Math.max(0, sel.from.line - 1), to = Math.min(lines.length, sel.to.line + 2);
       for (var i = from; i < to; ++i) text.push(lines[i].text);
       text = input.value = text.join(lineSep);
       var startch = sel.from.ch, endch = sel.to.ch;
       for (var i = from; i < sel.from.line; ++i)
         startch += lineSep.length + lines[i].text.length;
       for (var i = from; i < sel.to.line; ++i)
         endch += lineSep.length + lines[i].text.length;
       editing = {text: text, from: from, to: to, start: startch, end: endch};
       setSelRange(input, startch, reducedSelection ? startch : endch);
+    }
     function focusInput() {
       if (options.readOnly != "nocursor") input.focus();
+    }
@@ @@ -752,59 +974,156 @@ var CodeMirror = (function() { @@
     function scrollEditorIntoView() {
       if (!cursor.getBoundingClientRect) return;
       var rect = cursor.getBoundingClientRect();
       // IE returns bogus coordinates when the instance sits inside of an iframe and the cursor is hidden
       if (ie && rect.top == rect.bottom) return;
       var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-      if (rect.top < 0 || rect.bottom > winH) cursor.scrollIntoView();
+      if (rect.top < 0 || rect.bottom > winH) scrollCursorIntoView();
+    }
     function scrollCursorIntoView() {
       var coords = calculateCursorCoords();
       return scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
+    }
     function calculateCursorCoords() {
       var cursor = localCoords(sel.inverted ? sel.from : sel.to);
       return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot);
       var x = options.lineWrapping ? Math.min(cursor.x, lineSpace.offsetWidth) : cursor.x;
       return {x: x, y: cursor.y, yBot: cursor.yBot};
+    }
     function scrollIntoView(x1, y1, x2, y2) {
       var pl = paddingLeft(), pt = paddingTop(), lh = lineHeight();
       var scrollPos = calculateScrollPos(x1, y1, x2, y2), scrolled = false;
       if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft; scrolled = true;}
       if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scrollPos.scrollTop; scrolled = true;}
       if (scrolled && options.onScroll) options.onScroll(instance);
+    }
     function calculateScrollPos(x1, y1, x2, y2) {
       var pl = paddingLeft(), pt = paddingTop();
       y1 += pt; y2 += pt; x1 += pl; x2 += pl;
       var screen = scroller.clientHeight, screentop = scroller.scrollTop, scrolled = false, result = true;
       if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;}
       else if (y2 > screentop + screen) {scroller.scrollTop = y2 + lh - screen; scrolled = true;}
       var screen = scroller.clientHeight, screentop = scrollbar.scrollTop, result = {};
       var atTop = y1 < paddingTop() + 10;
       if (y1 < screentop) result.scrollTop = atTop ? 0 : Math.max(0, y1);
       else if (y2 > screentop + screen) result.scrollTop = y2 - screen;
       var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft;
       var gutterw = options.fixedGutter ? gutter.clientWidth : 0;
       if (x1 < screenleft + gutterw) {
         if (x1 < 50) x1 = 0;
         scroller.scrollLeft = Math.max(0, x1 - 10 - gutterw);
         scrolled = true;
       var atLeft = x1 < gutterw + pl + 10;
       if (x1 < screenleft + gutterw || atLeft) {
         if (atLeft) x1 = 0;
         result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
       } else if (x2 > screenw + screenleft - 3) {
         result.scrollLeft = x2 + 10 - screenw;
+      }
       else if (x2 > screenw + screenleft) {
         scroller.scrollLeft = x2 + 10 - screenw;
         scrolled = true;
         if (x2 > code.clientWidth) result = false;
+      }
       if (scrolled && options.onScroll) options.onScroll(instance);
       return result;
+    }
     function visibleLines() {
       var lh = lineHeight(), top = scroller.scrollTop - paddingTop();
       return {from: Math.min(lines.length, Math.max(0, Math.floor(top / lh))),
               to: Math.min(lines.length, Math.ceil((top + scroller.clientHeight) / lh))};
     function visibleLines(scrollTop) {
       var lh = textHeight(), top = (scrollTop != null ? scrollTop : scrollbar.scrollTop) - paddingTop();
       var fromHeight = Math.max(0, Math.floor(top / lh));
       var toHeight = Math.ceil((top + scroller.clientHeight) / lh);
       return {from: lineAtHeight(doc, fromHeight),
               to: lineAtHeight(doc, toHeight)};
+    }
     // Uses a set of changes plus the current scroll position to
     // determine which DOM updates have to be made, and makes the
     // updates.
     function updateDisplay(changes) {
+    function updateDisplay(changes, suppressCallback, scrollTop) {
       if (!scroller.clientWidth) {
         showingFrom = showingTo = 0;
         showingFrom = showingTo = displayOffset = 0;
         return;
+      }
       // Compute the new visible window
       // If scrollTop is specified, use that to determine which lines
       // to render instead of the current scrollbar position.
       var visible = visibleLines(scrollTop);
       // Bail out if the visible area is already rendered and nothing changed.
       if (changes !== true && changes.length == 0 && visible.from > showingFrom && visible.to < showingTo) {
         updateVerticalScroll(scrollTop);
         return;
+      }
       var from = Math.max(visible.from - 100, 0), to = Math.min(doc.size, visible.to + 100);
       if (showingFrom < from && from - showingFrom < 20) from = showingFrom;
       if (showingTo > to && showingTo - to < 20) to = Math.min(doc.size, showingTo);
       // Create a range of theoretically intact lines, and punch holes
       // in that using the change info.
       var intact = changes === true ? [] :
         computeIntact([{from: showingFrom, to: showingTo, domStart: 0}], changes);
       // Clip off the parts that won't be visible
       var intactLines = 0;
       for (var i = 0; i < intact.length; ++i) {
         var range = intact[i];
         if (range.from < from) {range.domStart += (from - range.from); range.from = from;}
         if (range.to > to) range.to = to;
         if (range.from >= range.to) intact.splice(i--, 1);
         else intactLines += range.to - range.from;
+      }
       if (intactLines == to - from && from == showingFrom && to == showingTo) {
         updateVerticalScroll(scrollTop);
         return;
+      }
       // First create a range of theoretically intact lines, and punch
       // holes in that using the change info.
       var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}];
       intact.sort(function(a, b) {return a.domStart - b.domStart;});
       var th = textHeight(), gutterDisplay = gutter.style.display;
       lineDiv.style.display = "none";
       patchDisplay(from, to, intact);
       lineDiv.style.display = gutter.style.display = "";
       var different = from != showingFrom || to != showingTo || lastSizeC != scroller.clientHeight + th;
       // This is just a bogus formula that detects when the editor is
       // resized or the font size changes.
       if (different) lastSizeC = scroller.clientHeight + th;
       showingFrom = from; showingTo = to;
       displayOffset = heightAtLine(doc, from);
       // Since this is all rather error prone, it is honoured with the
       // only assertion in the whole file.
       if (lineDiv.childNodes.length != showingTo - showingFrom)
         throw new Error("BAD PATCH! " + JSON.stringify(intact) + " size=" + (showingTo - showingFrom) +
                         " nodes=" + lineDiv.childNodes.length);
       function checkHeights() {
         var curNode = lineDiv.firstChild, heightChanged = false;
         doc.iter(showingFrom, showingTo, function(line) {
           if (!line.hidden) {
             var height = Math.round(curNode.offsetHeight / th) || 1;
             if (line.height != height) {
               updateLineHeight(line, height);
               gutterDirty = heightChanged = true;
+            }
+          }
           curNode = curNode.nextSibling;
         });
         return heightChanged;
+      }
       if (options.lineWrapping) {
         // Guess whether we're going to need the scrollbar, so that we don't end up changing the linewrapping
         // after the scrollbar appears (during updateVerticalScroll()). Only do this if the scrollbar is
         // appearing (if it's disappearing, we don't have to worry about the scroll position, and there are
         // issues on IE7 if we turn it off too early).
         var virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
         if (virtualHeight > scrollbarHeight) scrollbar.style.display = "block";
         checkHeights();
+      }
       gutter.style.display = gutterDisplay;
       if (different || gutterDirty) {
         // If the gutter grew in size, re-check heights. If those changed, re-draw gutter.
         updateGutter() && options.lineWrapping && checkHeights() && updateGutter();
+      }
       updateSelection();
       updateVerticalScroll(scrollTop);
       if (!suppressCallback && options.onUpdate) options.onUpdate(instance);
       return true;
+    }
     function computeIntact(intact, changes) {
       for (var i = 0, l = changes.length || 0; i < l; ++i) {
         var change = changes[i], intact2 = [], diff = change.diff || 0;
         for (var j = 0, l2 = intact.length; j < l2; ++j) {
           var range = intact[j];
           if (change.to <= range.from)
             intact2.push({from: range.from + diff, to: range.to + diff, domStart: range.domStart});
           else if (range.to <= change.from)
           if (change.to <= range.from && change.diff)
             intact2.push({from: range.from + diff, to: range.to + diff,
                           domStart: range.domStart});
           else if (change.to <= range.from || change.from >= range.to)
             intact2.push(range);
           else {
             if (change.from > range.from)
@@ @@ -816,168 +1135,130 @@ var CodeMirror = (function() { @@
+        }
         intact = intact2;
+      }
       // Then, determine which lines we'd want to see, and which
       // updates have to be made to get there.
       var visible = visibleLines();
       var from = Math.min(showingFrom, Math.max(visible.from - 3, 0)),
           to = Math.min(lines.length, Math.max(showingTo, visible.to + 3)),
           updates = [], domPos = 0, domEnd = showingTo - showingFrom, pos = from, changedLines = 0;
       for (var i = 0, l = intact.length; i < l; ++i) {
         var range = intact[i];
         if (range.to <= from) continue;
         if (range.from >= to) break;
         if (range.domStart > domPos || range.from > pos) {
           updates.push({from: pos, to: range.from, domSize: range.domStart - domPos, domStart: domPos});
           changedLines += range.from - pos;
+        }
         pos = range.to;
         domPos = range.domStart + (range.to - range.from);
+      }
       if (domPos != domEnd || pos != to) {
         changedLines += Math.abs(to - pos);
         updates.push({from: pos, to: to, domSize: domEnd - domPos, domStart: domPos});
         if (to - pos != domEnd - domPos) gutterDirty = true;
+      }
       if (!updates.length) return;
       lineDiv.style.display = "none";
       // If more than 30% of the screen needs update, just do a full
       // redraw (which is quicker than patching)
       if (changedLines > (visible.to - visible.from) * .3)
         refreshDisplay(from = Math.max(visible.from - 10, 0), to = Math.min(visible.to + 7, lines.length));
       // Otherwise, only update the stuff that needs updating.
       else
         patchDisplay(updates);
       lineDiv.style.display = "";
       // Position the mover div to align with the lines it's supposed
       // to be showing (which will cover the visible display)
       var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight;
       showingFrom = from; showingTo = to;
       mover.style.top = (from * lineHeight()) + "px";
       if (different) {
         lastHeight = scroller.clientHeight;
         code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px";
+      }
       if (different || gutterDirty) updateGutter();
       if (maxWidth == null) maxWidth = stringWidth(maxLine);
       if (maxWidth > scroller.clientWidth) {
         lineSpace.style.width = maxWidth + "px";
         // Needed to prevent odd wrapping/hiding of widgets placed in here.
         code.style.width = "";
         code.style.width = scroller.scrollWidth + "px";
       } else {
         lineSpace.style.width = code.style.width = "";
+      }
       // Since this is all rather error prone, it is honoured with the
       // only assertion in the whole file.
       if (lineDiv.childNodes.length != showingTo - showingFrom)
         throw new Error("BAD PATCH! " + JSON.stringify(updates) + " size=" + (showingTo - showingFrom) +
                         " nodes=" + lineDiv.childNodes.length);
       updateCursor();
       return intact;
+    }
     function refreshDisplay(from, to) {
       var html = [], start = {line: from, ch: 0}, inSel = posLess(sel.from, start) && !posLess(sel.to, start);
       for (var i = from; i < to; ++i) {
         var ch1 = null, ch2 = null;
         if (inSel) {
           ch1 = 0;
           if (sel.to.line == i) {inSel = false; ch2 = sel.to.ch;}
     function patchDisplay(from, to, intact) {
       // The first pass removes the DOM nodes that aren't intact.
       if (!intact.length) lineDiv.innerHTML = "";
       else {
         function killNode(node) {
           var tmp = node.nextSibling;
           node.parentNode.removeChild(node);
           return tmp;
+        }
         else if (sel.from.line == i) {
           if (sel.to.line == i) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
           else {inSel = true; ch1 = sel.from.ch;}
         var domPos = 0, curNode = lineDiv.firstChild, n;
         for (var i = 0; i < intact.length; ++i) {
           var cur = intact[i];
           while (cur.domStart > domPos) {curNode = killNode(curNode); domPos++;}
           for (var j = 0, e = cur.to - cur.from; j < e; ++j) {curNode = curNode.nextSibling; domPos++;}
+        }
-        html.push(lines[i].getHTML(ch1, ch2, true));
+        while (curNode) curNode = killNode(curNode);
+      }
       lineDiv.innerHTML = html.join("");
+    }
     function patchDisplay(updates) {
       // Slightly different algorithm for IE (badInnerHTML), since
       // there .innerHTML on PRE nodes is dumb, and discards
       // whitespace.
       var sfrom = sel.from.line, sto = sel.to.line, off = 0,
           scratch = badInnerHTML && targetDocument.createElement("div");
       for (var i = 0, e = updates.length; i < e; ++i) {
         var rec = updates[i];
         var extra = (rec.to - rec.from) - rec.domSize;
         var nodeAfter = lineDiv.childNodes[rec.domStart + rec.domSize + off] || null;
         if (badInnerHTML)
           for (var j = Math.max(-extra, rec.domSize); j > 0; --j)
             lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
         else if (extra) {
           for (var j = Math.max(0, extra); j > 0; --j)
             lineDiv.insertBefore(targetDocument.createElement("pre"), nodeAfter);
           for (var j = Math.max(0, -extra); j > 0; --j)
             lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild);
       // This pass fills in the lines that actually changed.
       var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
       var scratch = document.createElement("div");
       doc.iter(from, to, function(line) {
         if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
         if (!nextIntact || nextIntact.from > j) {
           if (line.hidden) var html = scratch.innerHTML = "<pre></pre>";
           else {
             var html = '<pre' + (line.className ? ' class="' + line.className + '"' : '') + '>'
               + line.getHTML(makeTab) + '</pre>';
             // Kludge to make sure the styled element lies behind the selection (by z-index)
             if (line.bgClassName)
               html = '<div style="position: relative"><pre class="' + line.bgClassName +
               '" style="position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2">&#160;</pre>' + html + "</div>";
+          }
           scratch.innerHTML = html;
           lineDiv.insertBefore(scratch.firstChild, curNode);
         } else {
           curNode = curNode.nextSibling;
+        }
         var node = lineDiv.childNodes[rec.domStart + off], inSel = sfrom < rec.from && sto >= rec.from;
         for (var j = rec.from; j < rec.to; ++j) {
           var ch1 = null, ch2 = null;
           if (inSel) {
             ch1 = 0;
             if (sto == j) {inSel = false; ch2 = sel.to.ch;}
+          }
           else if (sfrom == j) {
             if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;}
             else {inSel = true; ch1 = sel.from.ch;}
+          }
           if (badInnerHTML) {
             scratch.innerHTML = lines[j].getHTML(ch1, ch2, true);
             lineDiv.insertBefore(scratch.firstChild, nodeAfter);
+          }
           else {
             node.innerHTML = lines[j].getHTML(ch1, ch2, false);
             node.className = lines[j].className || "";
             node = node.nextSibling;
+          }
+        }
         off += extra;
+      }
         ++j;
       });
+    }
     function updateGutter() {
       if (!options.gutter && !options.lineNumbers) return;
       var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
       gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
       var html = [];
       for (var i = showingFrom; i < Math.max(showingTo, showingFrom + 1); ++i) {
         var marker = lines[i].gutterMarker;
         var text = options.lineNumbers ? i + options.firstLineNumber : null;
         if (marker && marker.text)
           text = marker.text.replace("%N%", text != null ? text : "");
         else if (text == null)
           text = "\u00a0";
         html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text, "</pre>");
+      }
       var html = [], i = showingFrom, normalNode;
       doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
         if (line.hidden) {
           html.push("<pre></pre>");
         } else {
           var marker = line.gutterMarker;
           var text = options.lineNumbers ? i + options.firstLineNumber : null;
           if (marker && marker.text)
             text = marker.text.replace("%N%", text != null ? text : "");
           else if (text == null)
             text = "\u00a0";
           html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text);
           for (var j = 1; j < line.height; ++j) html.push("<br/>&#160;");
           html.push("</pre>");
           if (!marker) normalNode = i;
+        }
         ++i;
       });
       gutter.style.display = "none";
       gutterText.innerHTML = html.join("");
       var minwidth = String(lines.length).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = "";
       while (val.length + pad.length < minwidth) pad += "\u00a0";
       if (pad) firstNode.insertBefore(targetDocument.createTextNode(pad), firstNode.firstChild);
       // Make sure scrolling doesn't cause number gutter size to pop
       if (normalNode != null && options.lineNumbers) {
         var node = gutterText.childNodes[normalNode - showingFrom];
         var minwidth = String(doc.size).length, val = eltText(node.firstChild), pad = "";
         while (val.length + pad.length < minwidth) pad += "\u00a0";
         if (pad) node.insertBefore(document.createTextNode(pad), node.firstChild);
+      }
       gutter.style.display = "";
       var resized = Math.abs((parseInt(lineSpace.style.marginLeft) || 0) - gutter.offsetWidth) > 2;
       lineSpace.style.marginLeft = gutter.offsetWidth + "px";
       gutterDirty = false;
       return resized;
+    }
     function updateCursor() {
       var head = sel.inverted ? sel.from : sel.to, lh = lineHeight();
       var x = charX(head.line, head.ch);
       var top = head.line * lh - scroller.scrollTop;
       inputDiv.style.top = Math.max(Math.min(top, scroller.offsetHeight), 0) + "px";
       inputDiv.style.left = (x - scroller.scrollLeft) + "px";
       if (posEq(sel.from, sel.to)) {
         cursor.style.top = (head.line - showingFrom) * lh + "px";
         cursor.style.left = x + "px";
     function updateSelection() {
       var collapsed = posEq(sel.from, sel.to);
       var fromPos = localCoords(sel.from, true);
       var toPos = collapsed ? fromPos : localCoords(sel.to, true);
       var headPos = sel.inverted ? fromPos : toPos, th = textHeight();
       var wrapOff = eltOffset(wrapper), lineOff = eltOffset(lineDiv);
       inputDiv.style.top = Math.max(0, Math.min(scroller.offsetHeight, headPos.y + lineOff.top - wrapOff.top)) + "px";
       inputDiv.style.left = Math.max(0, Math.min(scroller.offsetWidth, headPos.x + lineOff.left - wrapOff.left)) + "px";
       if (collapsed) {
         cursor.style.top = headPos.y + "px";
         cursor.style.left = (options.lineWrapping ? Math.min(headPos.x, lineSpace.offsetWidth) : headPos.x) + "px";
         cursor.style.display = "";
         selectionDiv.style.display = "none";
       } else {
         var sameLine = fromPos.y == toPos.y, html = "";
         var clientWidth = lineSpace.clientWidth || lineSpace.offsetWidth;
         var clientHeight = lineSpace.clientHeight || lineSpace.offsetHeight;
         function add(left, top, right, height) {
           var rstyle = quirksMode ? "width: " + (!right ? clientWidth : clientWidth - right - left) + "px"
                                   : "right: " + right + "px";
           html += '<div class="CodeMirror-selected" style="position: absolute; left: ' + left +
             'px; top: ' + top + 'px; ' + rstyle + '; height: ' + height + 'px"></div>';
+        }
         if (sel.from.ch && fromPos.y >= 0) {
           var right = sameLine ? clientWidth - toPos.x : 0;
           add(fromPos.x, fromPos.y, right, th);
+        }
         var middleStart = Math.max(0, fromPos.y + (sel.from.ch ? th : 0));
         var middleHeight = Math.min(toPos.y, clientHeight) - middleStart;
         if (middleHeight > 0.2 * th)
           add(0, middleStart, 0, middleHeight);
         if ((!sameLine || !sel.from.ch) && toPos.y < clientHeight - .5 * th)
           add(0, toPos.y, clientWidth - toPos.x, th);
         selectionDiv.innerHTML = html;
         cursor.style.display = "none";
         selectionDiv.style.display = "";
+      }
       else cursor.style.display = "none";
+    }
     function setShift(val) {
       if (val) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from);
       else shiftSelecting = null;
+    }
     function setSelectionUser(from, to) {
       var sh = shiftSelecting && clipPos(shiftSelecting);
       if (sh) {
@@ @@ -985,130 +1266,166 @@ var CodeMirror = (function() { @@
         else if (posLess(to, sh)) to = sh;
+      }
       setSelection(from, to);
       userSelChange = true;
+    }
     // Update the selection. Last two args are only used by
     // updateLines, since they have to be expressed in the line
     // numbers before the update.
     function setSelection(from, to, oldFrom, oldTo) {
       goalColumn = null;
       if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
       if (posEq(sel.from, from) && posEq(sel.to, to)) return;
       if (posLess(to, from)) {var tmp = to; to = from; from = tmp;}
       // Skip over hidden lines.
       if (from.line != oldFrom) {
         var from1 = skipHidden(from, oldFrom, sel.from.ch);
         // If there is no non-hidden line left, force visibility on current line
         if (!from1) setLineHidden(from.line, false);
         else from = from1;
+      }
       if (to.line != oldTo) to = skipHidden(to, oldTo, sel.to.ch);
       if (posEq(from, to)) sel.inverted = false;
       else if (posEq(from, sel.to)) sel.inverted = false;
       else if (posEq(to, sel.from)) sel.inverted = true;
       // Some ugly logic used to only mark the lines that actually did
       // see a change in selection as changed, rather than the whole
       // selected range.
       if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;}
       if (posEq(from, to)) {
         if (!posEq(sel.from, sel.to))
           changes.push({from: oldFrom, to: oldTo + 1});
+      }
       else if (posEq(sel.from, sel.to)) {
         changes.push({from: from.line, to: to.line + 1});
+      }
       else {
         if (!posEq(from, sel.from)) {
           if (from.line < oldFrom)
             changes.push({from: from.line, to: Math.min(to.line, oldFrom) + 1});
           else
             changes.push({from: oldFrom, to: Math.min(oldTo, from.line) + 1});
+        }
         if (!posEq(to, sel.to)) {
           if (to.line < oldTo)
             changes.push({from: Math.max(oldFrom, from.line), to: oldTo + 1});
           else
             changes.push({from: Math.max(from.line, oldTo), to: to.line + 1});
       if (options.autoClearEmptyLines && posEq(sel.from, sel.to)) {
         var head = sel.inverted ? from : to;
         if (head.line != sel.from.line && sel.from.line < doc.size) {
           var oldLine = getLine(sel.from.line);
           if (/^\s+$/.test(oldLine.text))
             setTimeout(operation(function() {
               if (oldLine.parent && /^\s+$/.test(oldLine.text)) {
                 var no = lineNo(oldLine);
                 replaceRange("", {line: no, ch: 0}, {line: no, ch: oldLine.text.length});
+              }
             }, 10));
+        }
+      }
       sel.from = from; sel.to = to;
       selectionChanged = true;
+    }
     function skipHidden(pos, oldLine, oldCh) {
       function getNonHidden(dir) {
         var lNo = pos.line + dir, end = dir == 1 ? doc.size : -1;
         while (lNo != end) {
           var line = getLine(lNo);
           if (!line.hidden) {
             var ch = pos.ch;
             if (toEnd || ch > oldCh || ch > line.text.length) ch = line.text.length;
             return {line: lNo, ch: ch};
+          }
           lNo += dir;
+        }
+      }
       var line = getLine(pos.line);
       var toEnd = pos.ch == line.text.length && pos.ch != oldCh;
       if (!line.hidden) return pos;
       if (pos.line >= oldLine) return getNonHidden(1) || getNonHidden(-1);
       else return getNonHidden(-1) || getNonHidden(1);
+    }
     function setCursor(line, ch, user) {
       var pos = clipPos({line: line, ch: ch || 0});
       (user ? setSelectionUser : setSelection)(pos, pos);
+    }
-    function clipLine(n) {return Math.max(0, Math.min(n, lines.length-1));}
+    function clipLine(n) {return Math.max(0, Math.min(n, doc.size-1));}
     function clipPos(pos) {
       if (pos.line < 0) return {line: 0, ch: 0};
       if (pos.line >= lines.length) return {line: lines.length-1, ch: lines[lines.length-1].text.length};
       var ch = pos.ch, linelen = lines[pos.line].text.length;
       if (pos.line >= doc.size) return {line: doc.size-1, ch: getLine(doc.size-1).text.length};
       var ch = pos.ch, linelen = getLine(pos.line).text.length;
       if (ch == null || ch > linelen) return {line: pos.line, ch: linelen};
       else if (ch < 0) return {line: pos.line, ch: 0};
       else return pos;
+    }
     function scrollPage(down) {
       var linesPerPage = Math.floor(scroller.clientHeight / lineHeight()), head = sel.inverted ? sel.from : sel.to;
       setCursor(head.line + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1)), head.ch, true);
+    }
     function scrollEnd(top) {
       var pos = top ? {line: 0, ch: 0} : {line: lines.length - 1, ch: lines[lines.length-1].text.length};
       setSelectionUser(pos, pos);
     function findPosH(dir, unit) {
       var end = sel.inverted ? sel.from : sel.to, line = end.line, ch = end.ch;
       var lineObj = getLine(line);
       function findNextLine() {
         for (var l = line + dir, e = dir < 0 ? -1 : doc.size; l != e; l += dir) {
           var lo = getLine(l);
           if (!lo.hidden) { line = l; lineObj = lo; return true; }
+        }
+      }
       function moveOnce(boundToLine) {
         if (ch == (dir < 0 ? 0 : lineObj.text.length)) {
           if (!boundToLine && findNextLine()) ch = dir < 0 ? lineObj.text.length : 0;
           else return false;
         } else ch += dir;
         return true;
+      }
       if (unit == "char") moveOnce();
       else if (unit == "column") moveOnce(true);
       else if (unit == "word") {
         var sawWord = false;
         for (;;) {
           if (dir < 0) if (!moveOnce()) break;
           if (isWordChar(lineObj.text.charAt(ch))) sawWord = true;
           else if (sawWord) {if (dir < 0) {dir = 1; moveOnce();} break;}
           if (dir > 0) if (!moveOnce()) break;
+        }
+      }
       return {line: line, ch: ch};
+    }
     function selectAll() {
       var endLine = lines.length - 1;
       setSelection({line: 0, ch: 0}, {line: endLine, ch: lines[endLine].text.length});
     function moveH(dir, unit) {
       var pos = dir < 0 ? sel.from : sel.to;
       if (shiftSelecting || posEq(sel.from, sel.to)) pos = findPosH(dir, unit);
       setCursor(pos.line, pos.ch, true);
+    }
     function deleteH(dir, unit) {
       if (!posEq(sel.from, sel.to)) replaceRange("", sel.from, sel.to);
       else if (dir < 0) replaceRange("", findPosH(dir, unit), sel.to);
       else replaceRange("", sel.from, findPosH(dir, unit));
       userSelChange = true;
+    }
     var goalColumn = null;
     function moveV(dir, unit) {
       var dist = 0, pos = localCoords(sel.inverted ? sel.from : sel.to, true);
       if (goalColumn != null) pos.x = goalColumn;
       if (unit == "page") dist = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
       else if (unit == "line") dist = textHeight();
       var target = coordsChar(pos.x, pos.y + dist * dir + 2);
       if (unit == "page") scrollbar.scrollTop += localCoords(target, true).y - pos.y;
       setCursor(target.line, target.ch, true);
       goalColumn = pos.x;
+    }
     function selectWordAt(pos) {
-      var line = lines[pos.line].text;
+      var line = getLine(pos.line).text;
       var start = pos.ch, end = pos.ch;
       while (start > 0 && /\w/.test(line.charAt(start - 1))) --start;
       while (end < line.length && /\w/.test(line.charAt(end))) ++end;
       while (start > 0 && isWordChar(line.charAt(start - 1))) --start;
       while (end < line.length && isWordChar(line.charAt(end))) ++end;
       setSelectionUser({line: pos.line, ch: start}, {line: pos.line, ch: end});
+    }
     function selectLine(line) {
       setSelectionUser({line: line, ch: 0}, {line: line, ch: lines[line].text.length});
+    }
     function handleEnter() {
       replaceSelection("\n", "end");
       if (options.enterMode != "flat")
         indentLine(sel.from.line, options.enterMode == "keep" ? "prev" : "smart");
       setSelectionUser({line: line, ch: 0}, clipPos({line: line + 1, ch: 0}));
+    }
     function handleTab(shift) {
       function indentSelected(mode) {
         if (posEq(sel.from, sel.to)) return indentLine(sel.from.line, mode);
         var e = sel.to.line - (sel.to.ch ? 0 : 1);
         for (var i = sel.from.line; i <= e; ++i) indentLine(i, mode);
+      }
       shiftSelecting = null;
       switch (options.tabMode) {
       case "default":
         return false;
       case "indent":
         indentSelected("smart");
         break;
       case "classic":
         if (posEq(sel.from, sel.to)) {
           if (shift) indentLine(sel.from.line, "smart");
           else replaceSelection("\t", "end");
           break;
+        }
       case "shift":
         indentSelected(shift ? "subtract" : "add");
         break;
+      }
       return true;
+    }
     function smartHome() {
       var firstNonWS = Math.max(0, lines[sel.from.line].text.search(/\S/));
       setCursor(sel.from.line, sel.from.ch <= firstNonWS && sel.from.ch ? 0 : firstNonWS, true);
     function indentSelected(mode) {
       if (posEq(sel.from, sel.to)) return indentLine(sel.from.line, mode);
       var e = sel.to.line - (sel.to.ch ? 0 : 1);
       for (var i = sel.from.line; i <= e; ++i) indentLine(i, mode);
+    }
     function indentLine(n, how) {
       if (!how) how = "add";
       if (how == "smart") {
         if (!mode.indent) how = "prev";
         else var state = getStateBefore(n);
+      }
       var line = lines[n], curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation;
       var line = getLine(n), curSpace = line.indentation(options.tabSize),
           curSpaceString = line.text.match(/^\s*/)[0], indentation;
       if (how == "smart") {
         indentation = mode.indent(state, line.text.slice(curSpaceString.length), line.text);
         if (indentation == Pass) how = "prev";
+      }
       if (how == "prev") {
-        if (n) indentation = lines[n-1].indentation();
+        if (n) indentation = getLine(n-1).indentation(options.tabSize);
         else indentation = 0;
+      }
       else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length));
       else if (how == "add") indentation = curSpace + options.indentUnit;
       else if (how == "subtract") indentation = curSpace - options.indentUnit;
       indentation = Math.max(0, indentation);
@@ @@ -1117,11 +1434,10 @@ var CodeMirror = (function() { @@
       if (!diff) {
         if (sel.from.line != n && sel.to.line != n) return;
         var indentString = curSpaceString;
+      }
       else {
       } else {
         var indentString = "", pos = 0;
         if (options.indentWithTabs)
           for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
+          for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
         while (pos < indentation) {++pos; indentString += " ";}
+      }
@@ @@ -1130,8 +1446,7 @@ var CodeMirror = (function() { @@
     function loadMode() {
       mode = CodeMirror.getMode(options, options.mode);
       for (var i = 0, l = lines.length; i < l; ++i)
         lines[i].stateAfter = null;
       doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
       work = [0];
       startWorker();
+    }
@@ @@ -1141,35 +1456,56 @@ var CodeMirror = (function() { @@
       if (visible) gutterDirty = true;
       else lineDiv.parentNode.style.marginLeft = 0;
+    }
     function markText(from, to, className) {
       from = clipPos(from); to = clipPos(to);
       var set = [];
       function add(line, from, to, className) {
         mark = lines[line].addMark(from, to, className, set);
     function wrappingChanged(from, to) {
       if (options.lineWrapping) {
         wrapper.className += " CodeMirror-wrap";
         var perLine = scroller.clientWidth / charWidth() - 3;
         doc.iter(0, doc.size, function(line) {
           if (line.hidden) return;
           var guess = Math.ceil(line.text.length / perLine) || 1;
           if (guess != 1) updateLineHeight(line, guess);
         });
         lineSpace.style.width = code.style.width = "";
         widthForcer.style.left = "";
       } else {
         wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
         maxLine = ""; maxLineChanged = true;
         doc.iter(0, doc.size, function(line) {
           if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
           if (line.text.length > maxLine.length) maxLine = line.text;
         });
+      }
       if (from.line == to.line) add(from.line, from.ch, to.ch, className);
       else {
         add(from.line, from.ch, null, className);
         for (var i = from.line + 1, e = to.line; i < e; ++i)
           add(i, 0, null, className);
         add(to.line, 0, to.ch, className);
+      }
       changes.push({from: from.line, to: to.line + 1});
       return new TextMarker(set);
       changes.push({from: 0, to: doc.size});
+    }
     function makeTab(col) {
       var w = options.tabSize - col % options.tabSize, cached = tabCache[w];
       if (cached) return cached;
       for (var str = '<span class="cm-tab">', i = 0; i < w; ++i) str += " ";
       return (tabCache[w] = {html: str + "</span>", width: w});
+    }
     function themeChanged() {
       scroller.className = scroller.className.replace(/\s*cm-s-\S+/g, "") +
         options.theme.replace(/(^|\s)\s*/g, " cm-s-");
+    }
     function keyMapChanged() {
       var style = keyMap[options.keyMap].style;
       wrapper.className = wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
         (style ? " cm-keymap-" + style : "");
+    }
-    function TextMarker(set) { this.set = set; }
+    function TextMarker() { this.set = []; }
     TextMarker.prototype.clear = operation(function() {
       var min = Infinity, max = -Infinity;
       for (var i = 0, e = this.set.length; i < e; ++i) {
         var mk = this.set[i].marked;
         for (var j = 0; j < mk.length; ++j) {
           if (mk[j].set == this.set) mk.splice(j--, 1);
+        }
         var line = this.set[i], mk = line.marked;
         if (!mk || !line.parent) continue;
         var lineN = lineNo(line);
         min = Math.min(min, lineN); max = Math.max(max, lineN);
         for (var j = 0; j < mk.length; ++j)
           if (mk[j].marker == this) mk.splice(j--, 1);
+      }
       // We don't know the exact lines that changed. Refreshing is
       // cheaper than finding them.
       changes.push({from: 0, to: lines.length});
       if (min != Infinity)
         changes.push({from: min, to: max + 1});
     });
     TextMarker.prototype.find = function() {
       var from, to;
@@ @@ -1177,10 +1513,10 @@ var CodeMirror = (function() { @@
         var line = this.set[i], mk = line.marked;
         for (var j = 0; j < mk.length; ++j) {
           var mark = mk[j];
-          if (mark.set == this.set) {
+          if (mark.marker == this) {
             if (mark.from != null || mark.to != null) {
               var found = indexOf(lines, line);
               if (found > -1) {
               var found = lineNo(line);
               if (found != null) {
                 if (mark.from != null) from = {line: found, ch: mark.from};
                 if (mark.to != null) to = {line: found, ch: mark.to};
+              }
@@ @@ -1191,45 +1527,113 @@ var CodeMirror = (function() { @@
       return {from: from, to: to};
     };
     function markText(from, to, className) {
       from = clipPos(from); to = clipPos(to);
       var tm = new TextMarker();
       if (!posLess(from, to)) return tm;
       function add(line, from, to, className) {
         getLine(line).addMark(new MarkedText(from, to, className, tm));
+      }
       if (from.line == to.line) add(from.line, from.ch, to.ch, className);
       else {
         add(from.line, from.ch, null, className);
         for (var i = from.line + 1, e = to.line; i < e; ++i)
           add(i, null, null, className);
         add(to.line, null, to.ch, className);
+      }
       changes.push({from: from.line, to: to.line + 1});
       return tm;
+    }
     function setBookmark(pos) {
       pos = clipPos(pos);
       var bm = new Bookmark(pos.ch);
       getLine(pos.line).addMark(bm);
       return bm;
+    }
     function findMarksAt(pos) {
       pos = clipPos(pos);
       var markers = [], marked = getLine(pos.line).marked;
       if (!marked) return markers;
       for (var i = 0, e = marked.length; i < e; ++i) {
         var m = marked[i];
         if ((m.from == null || m.from <= pos.ch) &&
             (m.to == null || m.to >= pos.ch))
           markers.push(m.marker || m);
+      }
       return markers;
+    }
     function addGutterMarker(line, text, className) {
-      if (typeof line == "number") line = lines[clipLine(line)];
+      if (typeof line == "number") line = getLine(clipLine(line));
       line.gutterMarker = {text: text, style: className};
       gutterDirty = true;
       return line;
+    }
     function removeGutterMarker(line) {
-      if (typeof line == "number") line = lines[clipLine(line)];
+      if (typeof line == "number") line = getLine(clipLine(line));
       line.gutterMarker = null;
       gutterDirty = true;
+    }
     function setLineClass(line, className) {
       if (typeof line == "number") {
         var no = line;
         line = lines[clipLine(line)];
+      }
       else {
         var no = indexOf(lines, line);
         if (no == -1) return null;
+      }
       if (line.className != className) {
         line.className = className;
         changes.push({from: no, to: no + 1});
+      }
     function changeLine(handle, op) {
       var no = handle, line = handle;
       if (typeof handle == "number") line = getLine(clipLine(handle));
       else no = lineNo(handle);
       if (no == null) return null;
       if (op(line, no)) changes.push({from: no, to: no + 1});
       else return null;
       return line;
+    }
     function setLineClass(handle, className, bgClassName) {
       return changeLine(handle, function(line) {
         if (line.className != className || line.bgClassName != bgClassName) {
           line.className = className;
           line.bgClassName = bgClassName;
           return true;
+        }
       });
+    }
     function setLineHidden(handle, hidden) {
       return changeLine(handle, function(line, no) {
         if (line.hidden != hidden) {
           line.hidden = hidden;
           if (!options.lineWrapping) {
             var l = line.text;
             if (hidden && l.length == maxLine.length) {
               updateMaxLine = true;
             } else if (!hidden && l.length > maxLine.length) {
               maxLine = l; maxWidth = null; updateMaxLine = false;
+            }
+          }
           updateLineHeight(line, hidden ? 0 : 1);
           var fline = sel.from.line, tline = sel.to.line;
           if (hidden && (fline == no || tline == no)) {
             var from = fline == no ? skipHidden({line: fline, ch: 0}, fline, 0) : sel.from;
             var to = tline == no ? skipHidden({line: tline, ch: 0}, tline, 0) : sel.to;
             // Can't hide the last visible line, we'd have no place to put the cursor
             if (!to) return;
             setSelection(from, to);
+          }
           return (gutterDirty = true);
+        }
       });
+    }
     function lineInfo(line) {
       if (typeof line == "number") {
         if (!isLine(line)) return null;
         var n = line;
-        line = lines[line];
+        line = getLine(line);
         if (!line) return null;
+      }
       else {
         var n = indexOf(lines, line);
         if (n == -1) return null;
       } else {
         var n = lineNo(line);
         if (n == null) return null;
+      }
       var marker = line.gutterMarker;
       return {line: n, text: line.text, markerText: marker && marker.text, markerClass: marker && marker.style};
       return {line: n, handle: line, text: line.text, markerText: marker && marker.text,
               markerClass: marker && marker.style, lineClass: line.className, bgClass: line.bgClassName};
+    }
     function stringWidth(str) {
@@ @@ -1239,21 +1643,15 @@ var CodeMirror = (function() { @@
+    }
     // These are used to go from pixel positions to character
     // positions, taking varying character widths into account.
     function charX(line, pos) {
       if (pos == 0) return 0;
       measure.innerHTML = "<pre><span>" + lines[line].getHTML(null, null, false, pos) + "</span></pre>";
       return measure.firstChild.firstChild.offsetWidth;
+    }
     function charFromX(line, x) {
       if (x <= 0) return 0;
-      var lineObj = lines[line], text = lineObj.text;
+      var lineObj = getLine(line), text = lineObj.text;
       function getX(len) {
         measure.innerHTML = "<pre><span>" + lineObj.getHTML(null, null, false, len) + "</span></pre>";
         return measure.firstChild.firstChild.offsetWidth;
         return measureLine(lineObj, len).left;
+      }
       var from = 0, fromX = 0, to = text.length, toX;
       // Guess a suitable upper bound for our search.
-      var estimated = Math.min(to, Math.ceil(x / stringWidth("x")));
+      var estimated = Math.min(to, Math.ceil(x / charWidth()));
       for (;;) {
         var estX = getX(estimated);
         if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
@@ @@ -1272,20 +1670,95 @@ var CodeMirror = (function() { @@
+      }
+    }
     var tempId = "CodeMirror-temp-" + Math.floor(Math.random() * 0xffffff).toString(16);
     function measureLine(line, ch) {
       if (ch == 0) return {top: 0, left: 0};
       var wbr = options.lineWrapping && ch < line.text.length &&
                 spanAffectsWrapping.test(line.text.slice(ch - 1, ch + 1));
       measure.innerHTML = "<pre>" + line.getHTML(makeTab, ch, tempId, wbr) + "</pre>";
       var elt = document.getElementById(tempId);
       var top = elt.offsetTop, left = elt.offsetLeft;
       // Older IEs report zero offsets for spans directly after a wrap
       if (ie && top == 0 && left == 0) {
         var backup = document.createElement("span");
         backup.innerHTML = "x";
         elt.parentNode.insertBefore(backup, elt.nextSibling);
         top = backup.offsetTop;
+      }
       return {top: top, left: left};
+    }
     function localCoords(pos, inLineWrap) {
       var lh = lineHeight(), line = pos.line - (inLineWrap ? showingFrom : 0);
       return {x: charX(pos.line, pos.ch), y: line * lh, yBot: (line + 1) * lh};
       var x, lh = textHeight(), y = lh * (heightAtLine(doc, pos.line) - (inLineWrap ? displayOffset : 0));
       if (pos.ch == 0) x = 0;
       else {
         var sp = measureLine(getLine(pos.line), pos.ch);
         x = sp.left;
         if (options.lineWrapping) y += Math.max(0, sp.top);
+      }
       return {x: x, y: y, yBot: y + lh};
+    }
     // Coords must be lineSpace-local
     function coordsChar(x, y) {
       if (y < 0) y = 0;
       var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
       var lineNo = lineAtHeight(doc, heightPos);
       if (lineNo >= doc.size) return {line: doc.size - 1, ch: getLine(doc.size - 1).text.length};
       var lineObj = getLine(lineNo), text = lineObj.text;
       var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
       if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
       function getX(len) {
         var sp = measureLine(lineObj, len);
         if (tw) {
           var off = Math.round(sp.top / th);
           return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
+        }
         return sp.left;
+      }
       var from = 0, fromX = 0, to = text.length, toX;
       // Guess a suitable upper bound for our search.
       var estimated = Math.min(to, Math.ceil((x + innerOff * scroller.clientWidth * .9) / cw));
       for (;;) {
         var estX = getX(estimated);
         if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
         else {toX = estX; to = estimated; break;}
+      }
       if (x > toX) return {line: lineNo, ch: to};
       // Try to guess a suitable lower bound as well.
       estimated = Math.floor(to * 0.8); estX = getX(estimated);
       if (estX < x) {from = estimated; fromX = estX;}
       // Do a binary search between these bounds.
       for (;;) {
         if (to - from <= 1) return {line: lineNo, ch: (toX - x > x - fromX) ? from : to};
         var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
         if (middleX > x) {to = middle; toX = middleX;}
         else {from = middle; fromX = middleX;}
+      }
+    }
     function pageCoords(pos) {
       var local = localCoords(pos, true), off = eltOffset(lineSpace);
       return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
+    }
     function lineHeight() {
       var nlines = lineDiv.childNodes.length;
       if (nlines) return (lineDiv.offsetHeight / nlines) || 1;
       measure.innerHTML = "<pre>x</pre>";
       return measure.firstChild.offsetHeight || 1;
     var cachedHeight, cachedHeightFor, measureText;
     function textHeight() {
       if (measureText == null) {
         measureText = "<pre>";
         for (var i = 0; i < 49; ++i) measureText += "x<br/>";
         measureText += "x</pre>";
+      }
       var offsetHeight = lineDiv.clientHeight;
       if (offsetHeight == cachedHeightFor) return cachedHeight;
       cachedHeightFor = offsetHeight;
       measure.innerHTML = measureText;
       cachedHeight = measure.firstChild.offsetHeight / 50 || 1;
       measure.innerHTML = "";
       return cachedHeight;
+    }
     var cachedWidth, cachedWidthFor = 0;
     function charWidth() {
       if (scroller.clientWidth == cachedWidthFor) return cachedWidth;
       cachedWidthFor = scroller.clientWidth;
       return (cachedWidth = stringWidth("x"));
+    }
     function paddingTop() {return lineSpace.offsetTop;}
     function paddingLeft() {return lineSpace.offsetLeft;}
@@ @@ -1300,12 +1773,11 @@ var CodeMirror = (function() { @@
       if (!liberal && (x - offW.left > scroller.clientWidth || y - offW.top > scroller.clientHeight))
         return null;
       var offL = eltOffset(lineSpace, true);
       var line = showingFrom + Math.floor((y - offL.top) / lineHeight());
       return clipPos({line: line, ch: charFromX(clipLine(line), x - offL.left)});
       return coordsChar(x - offL.left, y - offL.top);
+    }
     function onContextMenu(e) {
       var pos = posFromMouse(e);
       if (!pos || window.opera) return; // Opera is difficult.
       var pos = posFromMouse(e), scrollPos = scrollbar.scrollTop;
       if (!pos || opera) return; // Opera is difficult.
       if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to))
         operation(setCursor)(pos.line, pos.ch);
@@ @@ -1317,14 +1789,15 @@ var CodeMirror = (function() { @@
       leaveInputAlone = true;
       var val = input.value = getSelection();
       focusInput();
-      setSelRange(input, 0, input.value.length);
+      selectInput(input);
       function rehide() {
         var newVal = splitLines(input.value).join("\n");
         if (newVal != val) operation(replaceSelection)(newVal, "end");
+        if (newVal != val && !options.readOnly) operation(replaceSelection)(newVal, "end");
         inputDiv.style.position = "relative";
         input.style.cssText = oldCSS;
         if (ie_lt9) scrollbar.scrollTop = scrollPos;
         leaveInputAlone = false;
-        prepareInput();
+        resetInput(true);
         slowPoll();
+      }
@@ @@ -1334,8 +1807,7 @@ var CodeMirror = (function() { @@
           mouseup();
           setTimeout(rehide, 20);
         }, true);
+      }
       else {
       } else {
         setTimeout(rehide, 50);
+      }
+    }
@@ @@ -1352,7 +1824,7 @@ var CodeMirror = (function() { @@
     var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
     function matchBrackets(autoclear) {
-      var head = sel.inverted ? sel.from : sel.to, line = lines[head.line], pos = head.ch - 1;
+      var head = sel.inverted ? sel.from : sel.to, line = getLine(head.line), pos = head.ch - 1;
       var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
       if (!match) return;
       var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles;
@@ @@ -1365,7 +1837,7 @@ var CodeMirror = (function() { @@
         var st = line.styles, pos = forward ? 0 : line.text.length - 1, cur;
         for (var i = forward ? 0 : st.length - 2, e = forward ? st.length : -2; i != e; i += 2*d) {
           var text = st[i];
-          if (st[i+1] != null && st[i+1] != style) {pos += d * text.length; continue;}
           if (st[i+1] != style) {pos += d * text.length; continue;}
           for (var j = forward ? 0 : text.length - 1, te = forward ? text.length : -1; j != te; j += d, pos+=d) {
             if (pos >= from && pos < to && re.test(cur = text.charAt(j))) {
               var match = matching[cur];
@@ @@ -1376,8 +1848,8 @@ var CodeMirror = (function() { @@
+          }
+        }
+      }
       for (var i = head.line, e = forward ? Math.min(i + 100, lines.length) : Math.max(-1, i - 100); i != e; i+=d) {
         var line = lines[i], first = i == head.line;
       for (var i = head.line, e = forward ? Math.min(i + 100, doc.size) : Math.max(-1, i - 100); i != e; i+=d) {
         var line = getLine(i), first = i == head.line;
         var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length);
         if (found) break;
+      }
@@ @@ -1399,9 +1871,9 @@ var CodeMirror = (function() { @@
       var minindent, minline;
       for (var search = n, lim = n - 40; search > lim; --search) {
         if (search == 0) return 0;
-        var line = lines[search-1];
+        var line = getLine(search-1);
         if (line.stateAfter) return search;
         var indented = line.indentation();
+        var indented = line.indentation(options.tabSize);
         if (minline == null || minindent > indented) {
           minline = search - 1;
           minindent = indented;
@@ @@ -1410,56 +1882,62 @@ var CodeMirror = (function() { @@
       return minline;
+    }
     function getStateBefore(n) {
-      var start = findStartLine(n), state = start && lines[start-1].stateAfter;
+      var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
       if (!state) state = startState(mode);
       else state = copyState(mode, state);
       for (var i = start; i < n; ++i) {
         var line = lines[i];
         line.highlight(mode, state);
       doc.iter(start, n, function(line) {
         line.highlight(mode, state, options.tabSize);
         line.stateAfter = copyState(mode, state);
+      }
       changes.push({from: start, to: n});
       if (n < lines.length && !lines[n].stateAfter) work.push(n);
       });
       if (start < n) changes.push({from: start, to: n});
       if (n < doc.size && !getLine(n).stateAfter) work.push(n);
       return state;
+    }
     function highlightLines(start, end) {
       var state = getStateBefore(start);
       for (var i = start; i < end; ++i) {
         var line = lines[i];
         line.highlight(mode, state);
       doc.iter(start, end, function(line) {
         line.highlight(mode, state, options.tabSize);
         line.stateAfter = copyState(mode, state);
+      }
+      });
+    }
     function highlightWorker() {
       var end = +new Date + options.workTime;
       var foundWork = work.length;
       while (work.length) {
-        if (!lines[showingFrom].stateAfter) var task = showingFrom;
+        if (!getLine(showingFrom).stateAfter) var task = showingFrom;
         else var task = work.pop();
         if (task >= lines.length) continue;
         var start = findStartLine(task), state = start && lines[start-1].stateAfter;
         if (task >= doc.size) continue;
         var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
         if (state) state = copyState(mode, state);
         else state = startState(mode);
         var unchanged = 0, compare = mode.compareStates, realChange = false;
         for (var i = start, l = lines.length; i < l; ++i) {
           var line = lines[i], hadState = line.stateAfter;
         var unchanged = 0, compare = mode.compareStates, realChange = false,
             i = start, bail = false;
         doc.iter(i, doc.size, function(line) {
           var hadState = line.stateAfter;
           if (+new Date > end) {
             work.push(i);
             startWorker(options.workDelay);
             if (realChange) changes.push({from: task, to: i + 1});
             return;
+            return (bail = true);
+          }
           var changed = line.highlight(mode, state);
+          var changed = line.highlight(mode, state, options.tabSize);
           if (changed) realChange = true;
           line.stateAfter = copyState(mode, state);
           var done = null;
           if (compare) {
             if (hadState && compare(hadState, state)) break;
           } else {
             var same = hadState && compare(hadState, state);
             if (same != Pass) done = !!same;
+          }
           if (done == null) {
             if (changed !== false || !hadState) unchanged = 0;
             else if (++unchanged > 3) break;
             else if (++unchanged > 3 && (!mode.indent || mode.indent(hadState, "") == mode.indent(state, "")))
               done = true;
+          }
+        }
           if (done) return true;
           ++i;
         });
         if (bail) return;
         if (realChange) changes.push({from: task, to: i + 1});
+      }
       if (foundWork && options.onHighlightComplete)
@@ @@ -1475,35 +1953,44 @@ var CodeMirror = (function() { @@
     // be awkward, slow, and error-prone), but instead updates are
     // batched and then all combined and executed at once.
     function startOperation() {
       updateInput = null; changes = []; textChanged = selectionChanged = false;
       updateInput = userSelChange = textChanged = null;
       changes = []; selectionChanged = false; callbacks = [];
+    }
     function endOperation() {
       var reScroll = false;
       if (selectionChanged) reScroll = !scrollCursorIntoView();
       if (changes.length) updateDisplay(changes);
       if (updateMaxLine) computeMaxLength();
       if (maxLineChanged && !options.lineWrapping) {
         widthForcer.style.left = stringWidth(maxLine) + "px";
         maxLineChanged = false;
+      }
       var newScrollPos, updated;
       if (selectionChanged) {
         var coords = calculateCursorCoords();
         newScrollPos = calculateScrollPos(coords.x, coords.y, coords.x, coords.yBot);
+      }
       if (changes.length) updated = updateDisplay(changes, true, (newScrollPos ? newScrollPos.scrollTop : null));
       else {
-        if (selectionChanged) updateCursor();
+        if (selectionChanged) updateSelection();
         if (gutterDirty) updateGutter();
+      }
-      if (reScroll) scrollCursorIntoView();
+      if (newScrollPos) scrollCursorIntoView();
       if (selectionChanged) {scrollEditorIntoView(); restartBlink();}
       // updateInput can be set to a boolean value to force/prevent an
       // update.
       if (focused && !leaveInputAlone &&
           (updateInput === true || (updateInput !== false && selectionChanged)))
-        prepareInput();
+        resetInput(userSelChange);
       if (selectionChanged && options.matchBrackets)
         setTimeout(operation(function() {
           if (bracketHighlighted) {bracketHighlighted(); bracketHighlighted = null;}
           matchBrackets(false);
+          if (posEq(sel.from, sel.to)) matchBrackets(false);
         }), 20);
       var tc = textChanged; // textChanged can be reset by cursoractivity callback
       if (selectionChanged && options.onCursorActivity)
       var sc = selectionChanged, cbs = callbacks; // these can be reset by callbacks
       if (textChanged && options.onChange && instance)
         options.onChange(instance, textChanged);
       if (sc && options.onCursorActivity)
         options.onCursorActivity(instance);
       if (tc && options.onChange && instance)
         options.onChange(instance, tc);
       for (var i = 0; i < cbs.length; ++i) cbs[i](instance);
       if (updated && options.onUpdate) options.onUpdate(instance);
+    }
     var nestedOperation = 0;
     function operation(f) {
@@ @@ -1515,120 +2002,11 @@ var CodeMirror = (function() { @@
       };
+    }
     function SearchCursor(query, pos, caseFold) {
       this.atOccurrence = false;
       if (caseFold == null) caseFold = typeof query == "string" && query == query.toLowerCase();
       if (pos && typeof pos == "object") pos = clipPos(pos);
       else pos = {line: 0, ch: 0};
       this.pos = {from: pos, to: pos};
       // The matches method is filled in based on the type of query.
       // It takes a position and a direction, and returns an object
       // describing the next occurrence of the query, or null if no
       // more matches were found.
       if (typeof query != "string") // Regexp match
         this.matches = function(reverse, pos) {
           if (reverse) {
             var line = lines[pos.line].text.slice(0, pos.ch), match = line.match(query), start = 0;
             while (match) {
               var ind = line.indexOf(match[0]);
               start += ind;
               line = line.slice(ind + 1);
               var newmatch = line.match(query);
               if (newmatch) match = newmatch;
               else break;
               start++;
+            }
+          }
           else {
             var line = lines[pos.line].text.slice(pos.ch), match = line.match(query),
                 start = match && pos.ch + line.indexOf(match[0]);
+          }
           if (match)
             return {from: {line: pos.line, ch: start},
                     to: {line: pos.line, ch: start + match[0].length},
                     match: match};
         };
       else { // String query
         if (caseFold) query = query.toLowerCase();
         var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
         var target = query.split("\n");
         // Different methods for single-line and multi-line queries
         if (target.length == 1)
           this.matches = function(reverse, pos) {
             var line = fold(lines[pos.line].text), len = query.length, match;
             if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
                         : (match = line.indexOf(query, pos.ch)) != -1)
               return {from: {line: pos.line, ch: match},
                       to: {line: pos.line, ch: match + len}};
           };
         else
           this.matches = function(reverse, pos) {
             var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(lines[ln].text);
             var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
             if (reverse ? offsetA >= pos.ch || offsetA != match.length
                         : offsetA <= pos.ch || offsetA != line.length - match.length)
               return;
             for (;;) {
               if (reverse ? !ln : ln == lines.length - 1) return;
               line = fold(lines[ln += reverse ? -1 : 1].text);
               match = target[reverse ? --idx : ++idx];
               if (idx > 0 && idx < target.length - 1) {
                 if (line != match) return;
                 else continue;
+              }
               var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length);
               if (reverse ? offsetB != line.length - match.length : offsetB != match.length)
                 return;
               var start = {line: pos.line, ch: offsetA}, end = {line: ln, ch: offsetB};
               return {from: reverse ? end : start, to: reverse ? start : end};
+            }
           };
+      }
     function compoundChange(f) {
       history.startCompound();
       try { return f(); } finally { history.endCompound(); }
+    }
     SearchCursor.prototype = {
       findNext: function() {return this.find(false);},
       findPrevious: function() {return this.find(true);},
       find: function(reverse) {
         var self = this, pos = clipPos(reverse ? this.pos.from : this.pos.to);
         function savePosAndFail(line) {
           var pos = {line: line, ch: 0};
           self.pos = {from: pos, to: pos};
           self.atOccurrence = false;
           return false;
+        }
         for (;;) {
           if (this.pos = this.matches(reverse, pos)) {
             this.atOccurrence = true;
             return this.pos.match || true;
+          }
           if (reverse) {
             if (!pos.line) return savePosAndFail(0);
             pos = {line: pos.line-1, ch: lines[pos.line-1].text.length};
+          }
           else {
             if (pos.line == lines.length - 1) return savePosAndFail(lines.length);
             pos = {line: pos.line+1, ch: 0};
+          }
+        }
       },
       from: function() {if (this.atOccurrence) return copyPos(this.pos.from);},
       to: function() {if (this.atOccurrence) return copyPos(this.pos.to);},
       replace: function(newText) {
         var self = this;
         if (this.atOccurrence)
           operation(function() {
             self.pos.to = replaceRange(newText, self.pos.from, self.pos.to);
           })();
+      }
     };
     for (var ext in extensions)
       if (extensions.propertyIsEnumerable(ext) &&
           !instance.propertyIsEnumerable(ext))
@@ @@ -1643,51 +2021,66 @@ var CodeMirror = (function() { @@
     theme: "default",
     indentUnit: 2,
     indentWithTabs: false,
     tabMode: "classic",
     enterMode: "indent",
     smartIndent: true,
     tabSize: 4,
     keyMap: "default",
     extraKeys: null,
     electricChars: true,
     autoClearEmptyLines: false,
     onKeyEvent: null,
     onDragEvent: null,
     lineWrapping: false,
     lineNumbers: false,
     gutter: false,
     fixedGutter: false,
     firstLineNumber: 1,
     readOnly: false,
-    smartHome: true,
+    dragDrop: true,
     onChange: null,
     onCursorActivity: null,
     onGutterClick: null,
     onHighlightComplete: null,
     onUpdate: null,
     onFocus: null, onBlur: null, onScroll: null,
     matchBrackets: false,
     workTime: 100,
     workDelay: 200,
     pollInterval: 100,
     undoDepth: 40,
     tabindex: null,
-    document: window.document
+    autofocus: null
   };
   var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
   var mac = ios || /Mac/.test(navigator.platform);
   var win = /Win/.test(navigator.platform);
   // Known modes, by name and by MIME
   var modes = {}, mimeModes = {};
+  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
   CodeMirror.defineMode = function(name, mode) {
     if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
     if (arguments.length > 2) {
       mode.dependencies = [];
       for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
+    }
     modes[name] = mode;
   };
   CodeMirror.defineMIME = function(mime, spec) {
     mimeModes[mime] = spec;
   };
-  CodeMirror.getMode = function(options, spec) {
+  CodeMirror.resolveMode = function(spec) {
     if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
       spec = mimeModes[spec];
     if (typeof spec == "string")
       var mname = spec, config = {};
     else if (spec != null)
       var mname = spec.name, config = spec;
     var mfactory = modes[mname];
     if (!mfactory) {
       if (window.console) console.warn("No mode " + mname + " found, falling back to plain text.");
       return CodeMirror.getMode(options, "text/plain");
+    }
     return mfactory(options, config || {});
     else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec))
       return CodeMirror.resolveMode("application/xml");
     if (typeof spec == "string") return {name: spec};
     else return spec || {name: "null"};
   };
   CodeMirror.getMode = function(options, spec) {
     var spec = CodeMirror.resolveMode(spec);
     var mfactory = modes[spec.name];
     if (!mfactory) return CodeMirror.getMode(options, "text/plain");
     return mfactory(options, spec);
   };
   CodeMirror.listModes = function() {
     var list = [];
@@ @@ -1702,16 +2095,137 @@ var CodeMirror = (function() { @@
     return list;
   };
   var extensions = {};
+  var extensions = CodeMirror.extensions = {};
   CodeMirror.defineExtension = function(name, func) {
     extensions[name] = func;
   };
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection({line: 0, ch: 0}, {line: cm.lineCount() - 1});},
     killLine: function(cm) {
       var from = cm.getCursor(true), to = cm.getCursor(false), sel = !posEq(from, to);
       if (!sel && cm.getLine(from.line).length == from.ch) cm.replaceRange("", from, {line: from.line + 1, ch: 0});
       else cm.replaceRange("", from, sel ? to : {line: from.line});
     },
     deleteLine: function(cm) {var l = cm.getCursor().line; cm.replaceRange("", {line: l, ch: 0}, {line: l});},
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
     goDocStart: function(cm) {cm.setCursor(0, 0, true);},
     goDocEnd: function(cm) {cm.setSelection({line: cm.lineCount() - 1}, null, true);},
     goLineStart: function(cm) {cm.setCursor(cm.getCursor().line, 0, true);},
     goLineStartSmart: function(cm) {
       var cur = cm.getCursor();
       var text = cm.getLine(cur.line), firstNonWS = Math.max(0, text.search(/\S/));
       cm.setCursor(cur.line, cur.ch <= firstNonWS && cur.ch ? 0 : firstNonWS, true);
     },
     goLineEnd: function(cm) {cm.setSelection({line: cm.getCursor().line}, null, true);},
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
     goPageUp: function(cm) {cm.moveV(-1, "page");},
     goPageDown: function(cm) {cm.moveV(1, "page");},
     goCharLeft: function(cm) {cm.moveH(-1, "char");},
     goCharRight: function(cm) {cm.moveH(1, "char");},
     goColumnLeft: function(cm) {cm.moveH(-1, "column");},
     goColumnRight: function(cm) {cm.moveH(1, "column");},
     goWordLeft: function(cm) {cm.moveH(-1, "word");},
     goWordRight: function(cm) {cm.moveH(1, "word");},
     delCharLeft: function(cm) {cm.deleteH(-1, "char");},
     delCharRight: function(cm) {cm.deleteH(1, "char");},
     delWordLeft: function(cm) {cm.deleteH(-1, "word");},
     delWordRight: function(cm) {cm.deleteH(1, "word");},
     indentAuto: function(cm) {cm.indentSelection("smart");},
     indentMore: function(cm) {cm.indentSelection("add");},
     indentLess: function(cm) {cm.indentSelection("subtract");},
     insertTab: function(cm) {cm.replaceSelection("\t", "end");},
     defaultTab: function(cm) {
       if (cm.somethingSelected()) cm.indentSelection("add");
       else cm.replaceSelection("\t", "end");
     },
     transposeChars: function(cm) {
       var cur = cm.getCursor(), line = cm.getLine(cur.line);
       if (cur.ch > 0 && cur.ch < line.length - 1)
         cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
                         {line: cur.line, ch: cur.ch - 1}, {line: cur.line, ch: cur.ch + 1});
     },
     newlineAndIndent: function(cm) {
       cm.replaceSelection("\n", "end");
       cm.indentLine(cm.getCursor().line);
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
   var keyMap = CodeMirror.keyMap = {};
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
     "Delete": "delCharRight", "Backspace": "delCharLeft", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
     "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
   };
   // Note that the save and find-related commands aren't defined by
   // default. Unknown commands are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
     "Ctrl-Home": "goDocStart", "Alt-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
     "Ctrl-Left": "goWordLeft", "Ctrl-Right": "goWordRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delWordLeft", "Ctrl-Delete": "delWordRight", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
     "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
     fallthrough: "basic"
   };
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
     "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goWordLeft",
     "Alt-Right": "goWordRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delWordLeft",
     "Ctrl-Alt-Backspace": "delWordRight", "Alt-Delete": "delWordRight", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
     "Cmd-[": "indentLess", "Cmd-]": "indentMore",
     fallthrough: ["basic", "emacsy"]
   };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
   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": "goPageUp", "Shift-Ctrl-V": "goPageDown", "Ctrl-D": "delCharRight", "Ctrl-H": "delCharLeft",
     "Alt-D": "delWordRight", "Alt-Backspace": "delWordLeft", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
   };
   function getKeyMap(val) {
     if (typeof val == "string") return keyMap[val];
     else return val;
+  }
   function lookupKey(name, extraMap, map, handle, stop) {
     function lookup(map) {
       map = getKeyMap(map);
       var found = map[name];
       if (found != null && handle(found)) return true;
       if (map.nofallthrough) {
         if (stop) stop();
         return true;
+      }
       var fallthrough = map.fallthrough;
       if (fallthrough == null) return false;
       if (Object.prototype.toString.call(fallthrough) != "[object Array]")
         return lookup(fallthrough);
       for (var i = 0, e = fallthrough.length; i < e; ++i) {
         if (lookup(fallthrough[i])) return true;
+      }
       return false;
+    }
     if (extraMap && lookup(extraMap)) return true;
     return lookup(map);
+  }
   function isModifierKey(event) {
     var name = keyNames[e_prop(event, "keyCode")];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
+  }
   CodeMirror.fromTextArea = function(textarea, options) {
     if (!options) options = {};
     options.value = textarea.value;
     if (!options.tabindex && textarea.tabindex)
       options.tabindex = textarea.tabindex;
     if (options.autofocus == null && textarea.getAttribute("autofocus") != null)
       options.autofocus = true;
     function save() {textarea.value = instance.getValue();}
     if (textarea.form) {
@@ @@ -1734,6 +2248,7 @@ var CodeMirror = (function() { @@
       textarea.parentNode.insertBefore(node, textarea.nextSibling);
     }, options);
     instance.save = save;
     instance.getTextArea = function() { return textarea; };
     instance.toTextArea = function() {
       save();
       textarea.parentNode.removeChild(instance.getWrapperElement());
@@ @@ -1760,16 +2275,17 @@ var CodeMirror = (function() { @@
+    }
     return nstate;
+  }
-  CodeMirror.startState = startState;
+  CodeMirror.copyState = copyState;
   function startState(mode, a1, a2) {
     return mode.startState ? mode.startState(a1, a2) : true;
+  }
-  CodeMirror.copyState = copyState;
+  CodeMirror.startState = startState;
   // The character stream used by a mode's parser.
   function StringStream(string) {
+  function StringStream(string, tabSize) {
     this.pos = this.start = 0;
     this.string = string;
     this.tabSize = tabSize || 8;
+  }
   StringStream.prototype = {
     eol: function() {return this.pos >= this.string.length;},
@@ @@ -1801,8 +2317,8 @@ var CodeMirror = (function() { @@
       if (found > -1) {this.pos = found; return true;}
     },
     backUp: function(n) {this.pos -= n;},
     column: function() {return countColumn(this.string, this.start);},
     indentation: function() {return countColumn(this.string);},
     column: function() {return countColumn(this.string, this.start, this.tabSize);},
     indentation: function() {return countColumn(this.string, null, this.tabSize);},
     match: function(pattern, consume, caseInsensitive) {
       if (typeof pattern == "string") {
         function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}
@@ @@ -1810,8 +2326,7 @@ var CodeMirror = (function() { @@
           if (consume !== false) this.pos += pattern.length;
           return true;
+        }
+      }
       else {
       } else {
         var match = this.string.slice(this.pos).match(pattern);
         if (match && consume !== false) this.pos += match[0].length;
         return match;
@@ @@ -1821,22 +2336,86 @@ var CodeMirror = (function() { @@
   };
   CodeMirror.StringStream = StringStream;
   function MarkedText(from, to, className, marker) {
     this.from = from; this.to = to; this.style = className; this.marker = marker;
+  }
   MarkedText.prototype = {
     attach: function(line) { this.marker.set.push(line); },
     detach: function(line) {
       var ix = indexOf(this.marker.set, line);
       if (ix > -1) this.marker.set.splice(ix, 1);
     },
     split: function(pos, lenBefore) {
       if (this.to <= pos && this.to != null) return null;
       var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
       var to = this.to == null ? null : this.to - pos + lenBefore;
       return new MarkedText(from, to, this.style, this.marker);
     },
     dup: function() { return new MarkedText(null, null, this.style, this.marker); },
     clipTo: function(fromOpen, from, toOpen, to, diff) {
       if (fromOpen && to > this.from && (to < this.to || this.to == null))
         this.from = null;
       else if (this.from != null && this.from >= from)
         this.from = Math.max(to, this.from) + diff;
       if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
         this.to = null;
       else if (this.to != null && this.to > from)
         this.to = to < this.to ? this.to + diff : from;
     },
     isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
     sameSet: function(x) { return this.marker == x.marker; }
   };
   function Bookmark(pos) {
     this.from = pos; this.to = pos; this.line = null;
+  }
   Bookmark.prototype = {
     attach: function(line) { this.line = line; },
     detach: function(line) { if (this.line == line) this.line = null; },
     split: function(pos, lenBefore) {
       if (pos < this.from) {
         this.from = this.to = (this.from - pos) + lenBefore;
         return this;
+      }
     },
     isDead: function() { return this.from > this.to; },
     clipTo: function(fromOpen, from, toOpen, to, diff) {
       if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
         this.from = 0; this.to = -1;
       } else if (this.from > from) {
         this.from = this.to = Math.max(to, this.from) + diff;
+      }
     },
     sameSet: function(x) { return false; },
     find: function() {
       if (!this.line || !this.line.parent) return null;
       return {line: lineNo(this.line), ch: this.from};
     },
     clear: function() {
       if (this.line) {
         var found = indexOf(this.line.marked, this);
         if (found != -1) this.line.marked.splice(found, 1);
         this.line = null;
+      }
+    }
   };
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
   function Line(text, styles) {
     this.styles = styles || [text, null];
     this.stateAfter = null;
     this.text = text;
     this.marked = this.gutterMarker = this.className = null;
     this.height = 1;
     this.marked = this.gutterMarker = this.className = this.bgClassName = this.handlers = null;
     this.stateAfter = this.parent = this.hidden = null;
+  }
   Line.inheritMarks = function(text, orig) {
     var ln = new Line(text), mk = orig.marked;
+    var ln = new Line(text), mk = orig && orig.marked;
     if (mk) {
       for (var i = 0; i < mk.length; ++i) {
         if (mk[i].to == null) {
+        if (mk[i].to == null && mk[i].style) {
           var newmk = ln.marked || (ln.marked = []), mark = mk[i];
           newmk.push({from: null, to: null, style: mark.style, set: mark.set});
           mark.set.push(ln);
           var nmark = mark.dup(); newmk.push(nmark); nmark.attach(ln);
+        }
+      }
+    }
@@ @@ -1853,23 +2432,11 @@ var CodeMirror = (function() { @@
       this.text = this.text.slice(0, from) + text + this.text.slice(to);
       this.stateAfter = null;
       if (mk) {
         var diff = text.length - (to - from), end = this.text.length;
         var changeStart = Math.min(from, from + diff);
         var diff = text.length - (to - from);
         for (var i = 0; i < mk.length; ++i) {
           var mark = mk[i], del = false;
           if (mark.from != null && mark.from >= end) del = true;
           else {
             if (mark.from != null && mark.from >= from) {
               mark.from += diff;
               if (mark.from <= 0) mark.from = from == null ? null : 0;
+            }
             else if (to_ == null) mark.to = null;
             if (mark.to != null && mark.to > from) {
               mark.to += diff;
               if (mark.to < 0) del = true;
+            }
+          }
           if (del || (mark.from != null && mark.to != null && mark.from >= mark.to)) mk.splice(i--, 1);
           var mark = mk[i];
           mark.clipTo(from == null, from || 0, to_ == null, to, diff);
           if (mark.isDead()) {mark.detach(this); mk.splice(i--, 1);}
+        }
+      }
     },
@@ @@ -1881,57 +2448,77 @@ var CodeMirror = (function() { @@
       if (mk) {
         for (var i = 0; i < mk.length; ++i) {
           var mark = mk[i];
           if (mark.to > pos || mark.to == null) {
           var newmark = mark.split(pos, textBefore.length);
           if (newmark) {
             if (!taken.marked) taken.marked = [];
             taken.marked.push({
               from: mark.from < pos || mark.from == null ? null : mark.from - pos + textBefore.length,
               to: mark.to == null ? null : mark.to - pos + textBefore.length,
               style: mark.style, set: mark.set
             });
             mark.set.push(taken);
             taken.marked.push(newmark); newmark.attach(taken);
             if (newmark == mark) mk.splice(i--, 1);
+          }
+        }
+      }
       return taken;
     },
     append: function(line) {
       if (!line.text.length) return;
       var mylen = this.text.length, mk = line.marked;
       var mylen = this.text.length, mk = line.marked, mymk = this.marked;
       this.text += line.text;
       copyStyles(0, line.text.length, line.styles, this.styles);
       if (mk && mk.length) {
         var mymk = this.marked || (this.marked = []);
       if (mymk) {
         for (var i = 0; i < mymk.length; ++i)
           if (mymk[i].to == null) mymk[i].to = mylen;
+      }
       if (mk && mk.length) {
         if (!mymk) this.marked = mymk = [];
         outer: for (var i = 0; i < mk.length; ++i) {
           var mark = mk[i];
           if (!mark.from) {
             for (var j = 0; j < mymk.length; ++j) {
               var mymark = mymk[j];
-              if (mymark.to == mylen && mymark.set == mark.set) {
+              if (mymark.to == mylen && mymark.sameSet(mark)) {
                 mymark.to = mark.to == null ? null : mark.to + mylen;
                 if (mymark.isDead()) {
                   mymark.detach(this);
                   mk.splice(i--, 1);
+                }
                 continue outer;
+              }
+            }
+          }
           mymk.push(mark);
-          mark.set.push(this);
+          mark.attach(this);
           mark.from += mylen;
           if (mark.to != null) mark.to += mylen;
+        }
+      }
     },
     addMark: function(from, to, style, set) {
       set.push(this);
     fixMarkEnds: function(other) {
       var mk = this.marked, omk = other.marked;
       if (!mk) return;
       for (var i = 0; i < mk.length; ++i) {
         var mark = mk[i], close = mark.to == null;
         if (close && omk) {
           for (var j = 0; j < omk.length; ++j)
             if (omk[j].sameSet(mark)) {close = false; break;}
+        }
         if (close) mark.to = this.text.length;
+      }
     },
     fixMarkStarts: function() {
       var mk = this.marked;
       if (!mk) return;
       for (var i = 0; i < mk.length; ++i)
         if (mk[i].from == null) mk[i].from = 0;
     },
     addMark: function(mark) {
       mark.attach(this);
       if (this.marked == null) this.marked = [];
-      this.marked.push({from: from, to: to, style: style, set: set});
+      this.marked.push(mark);
       this.marked.sort(function(a, b){return (a.from || 0) - (b.from || 0);});
     },
     // Run the given mode's parser over a line, update the styles
     // array, which contains alternating fragments of text and CSS
     // classes.
     highlight: function(mode, state) {
       var stream = new StringStream(this.text), st = this.styles, pos = 0;
     highlight: function(mode, state, tabSize) {
       var stream = new StringStream(this.text, tabSize), st = this.styles, pos = 0;
       var changed = false, curWord = st[0], prevWord;
       if (this.text == "" && mode.blankLine) mode.blankLine(state);
       while (!stream.eol()) {
@@ @@ -1972,74 +2559,125 @@ var CodeMirror = (function() { @@
               className: style || null,
               state: state};
     },
     indentation: function() {return countColumn(this.text);},
+    indentation: function(tabSize) {return countColumn(this.text, null, tabSize);},
     // Produces an HTML fragment for the line, taking selection,
     // marking, and highlighting into account.
     getHTML: function(sfrom, sto, includePre, endAt) {
       var html = [];
       if (includePre)
         html.push(this.className ? '<pre class="' + this.className + '">': "<pre>");
       function span(text, style) {
     getHTML: function(makeTab, wrapAt, wrapId, wrapWBR) {
       var html = [], first = true, col = 0;
       function span_(text, style) {
         if (!text) return;
         if (style) html.push('<span class="', style, '">', htmlEscape(text), "</span>");
         else html.push(htmlEscape(text));
         // Work around a bug where, in some compat modes, IE ignores leading spaces
         if (first && ie && text.charAt(0) == " ") text = "\u00a0" + text.slice(1);
         first = false;
         if (text.indexOf("\t") == -1) {
           col += text.length;
           var escaped = htmlEscape(text);
         } else {
           var escaped = "";
           for (var pos = 0;;) {
             var idx = text.indexOf("\t", pos);
             if (idx == -1) {
               escaped += htmlEscape(text.slice(pos));
               col += text.length - pos;
               break;
             } else {
               col += idx - pos;
               var tab = makeTab(col);
               escaped += htmlEscape(text.slice(pos, idx)) + tab.html;
               col += tab.width;
               pos = idx + 1;
+            }
+          }
+        }
         if (style) html.push('<span class="', style, '">', escaped, "</span>");
         else html.push(escaped);
+      }
       var span = span_;
       if (wrapAt != null) {
         var outPos = 0, open = "<span id=\"" + wrapId + "\">";
         span = function(text, style) {
           var l = text.length;
           if (wrapAt >= outPos && wrapAt < outPos + l) {
             if (wrapAt > outPos) {
               span_(text.slice(0, wrapAt - outPos), style);
               // See comment at the definition of spanAffectsWrapping
               if (wrapWBR) html.push("<wbr>");
+            }
             html.push(open);
             var cut = wrapAt - outPos;
             span_(opera ? text.slice(cut, cut + 1) : text.slice(cut), style);
             html.push("</span>");
             if (opera) span_(text.slice(cut + 1), style);
             wrapAt--;
             outPos += l;
           } else {
             outPos += l;
             span_(text, style);
             // Output empty wrapper when at end of line
             if (outPos == wrapAt && outPos == len) html.push(open + " </span>");
             // Stop outputting HTML when gone sufficiently far beyond measure
             else if (outPos > wrapAt + 10 && /\s/.test(text)) span = function(){};
+          }
+        }
+      }
       var st = this.styles, allText = this.text, marked = this.marked;
       if (sfrom == sto) sfrom = null;
       var len = allText.length;
       if (endAt != null) len = Math.min(endAt, len);
       function styleToClass(style) {
         if (!style) return null;
         return "cm-" + style.replace(/ +/g, " cm-");
+      }
       if (!allText && endAt == null)
         span(" ", sfrom != null && sto == null ? "CodeMirror-selected" : null);
       else if (!marked && sfrom == null)
       if (!allText && wrapAt == null) {
         span(" ");
       } else if (!marked || !marked.length) {
         for (var i = 0, ch = 0; ch < len; i+=2) {
           var str = st[i], style = st[i+1], l = str.length;
           if (ch + l > len) str = str.slice(0, len - ch);
           ch += l;
-          span(str, style && "cm-" + style);
+          span(str, styleToClass(style));
+        }
       else {
+      } else {
         var pos = 0, i = 0, text = "", style, sg = 0;
         var markpos = -1, mark = null;
         function nextMark() {
           if (marked) {
             markpos += 1;
             mark = (markpos < marked.length) ? marked[markpos] : null;
         var nextChange = marked[0].from || 0, marks = [], markpos = 0;
         function advanceMarks() {
           var m;
           while (markpos < marked.length &&
                  ((m = marked[markpos]).from == pos || m.from == null)) {
             if (m.style != null) marks.push(m);
             ++markpos;
+          }
           nextChange = markpos < marked.length ? marked[markpos].from : Infinity;
           for (var i = 0; i < marks.length; ++i) {
             var to = marks[i].to || Infinity;
             if (to == pos) marks.splice(i--, 1);
             else nextChange = Math.min(to, nextChange);
+          }
+        }
-        nextMark();
+        var m = 0;
         while (pos < len) {
           var upto = len;
           var extraStyle = "";
           if (sfrom != null) {
             if (sfrom > pos) upto = sfrom;
             else if (sto == null || sto > pos) {
               extraStyle = " CodeMirror-selected";
               if (sto != null) upto = Math.min(upto, sto);
           if (nextChange == pos) advanceMarks();
           var upto = Math.min(len, nextChange);
           while (true) {
             if (text) {
               var end = pos + text.length;
               var appliedStyle = style;
               for (var j = 0; j < marks.length; ++j)
                 appliedStyle = (appliedStyle ? appliedStyle + " " : "") + marks[j].style;
               span(end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
               if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
               pos = end;
+            }
+          }
           while (mark && mark.to != null && mark.to <= pos) nextMark();
           if (mark) {
             if (mark.from > pos) upto = Math.min(upto, mark.from);
             else {
               extraStyle += " " + mark.style;
               if (mark.to != null) upto = Math.min(upto, mark.to);
+            }
+          }
           for (;;) {
             var end = pos + text.length;
             var appliedStyle = style;
             if (extraStyle) appliedStyle = style ? style + extraStyle : extraStyle;
             span(end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
             if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
             pos = end;
             text = st[i++]; style = "cm-" + st[i++];
             text = st[i++]; style = styleToClass(st[i++]);
+          }
+        }
         if (sfrom != null && sto == null) span(" ", "CodeMirror-selected");
+      }
       if (includePre) html.push("</pre>");
       return html.join("");
     },
     cleanUp: function() {
       this.parent = null;
       if (this.marked)
         for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
+    }
   };
   // Utility used by replace and split above
@@ @@ -2049,8 +2687,7 @@ var CodeMirror = (function() { @@
       if (state == 0) {
         if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]);
         if (end >= from) state = 1;
+      }
       else if (state == 1) {
       } else if (state == 1) {
         if (end > to) dest.push(part.slice(0, to - pos), source[i+1]);
         else dest.push(part, source[i+1]);
+      }
@@ @@ -2058,36 +2695,229 @@ var CodeMirror = (function() { @@
+    }
+  }
   // Data structure that holds the sequence of lines.
   function LeafChunk(lines) {
     this.lines = lines;
     this.parent = null;
     for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
       lines[i].parent = this;
       height += lines[i].height;
+    }
     this.height = height;
+  }
   LeafChunk.prototype = {
     chunkSize: function() { return this.lines.length; },
     remove: function(at, n, callbacks) {
       for (var i = at, e = at + n; i < e; ++i) {
         var line = this.lines[i];
         this.height -= line.height;
         line.cleanUp();
         if (line.handlers)
           for (var j = 0; j < line.handlers.length; ++j) callbacks.push(line.handlers[j]);
+      }
       this.lines.splice(at, n);
     },
     collapse: function(lines) {
       lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
     },
     insertHeight: function(at, lines, height) {
       this.height += height;
       this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
       for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
     },
     iterN: function(at, n, op) {
       for (var e = at + n; at < e; ++at)
         if (op(this.lines[at])) return true;
+    }
   };
   function BranchChunk(children) {
     this.children = children;
     var size = 0, height = 0;
     for (var i = 0, e = children.length; i < e; ++i) {
       var ch = children[i];
       size += ch.chunkSize(); height += ch.height;
       ch.parent = this;
+    }
     this.size = size;
     this.height = height;
     this.parent = null;
+  }
   BranchChunk.prototype = {
     chunkSize: function() { return this.size; },
     remove: function(at, n, callbacks) {
       this.size -= n;
       for (var i = 0; i < this.children.length; ++i) {
         var child = this.children[i], sz = child.chunkSize();
         if (at < sz) {
           var rm = Math.min(n, sz - at), oldHeight = child.height;
           child.remove(at, rm, callbacks);
           this.height -= oldHeight - child.height;
           if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
           if ((n -= rm) == 0) break;
           at = 0;
         } else at -= sz;
+      }
       if (this.size - n < 25) {
         var lines = [];
         this.collapse(lines);
         this.children = [new LeafChunk(lines)];
         this.children[0].parent = this;
+      }
     },
     collapse: function(lines) {
       for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
     },
     insert: function(at, lines) {
       var height = 0;
       for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
       this.insertHeight(at, lines, height);
     },
     insertHeight: function(at, lines, height) {
       this.size += lines.length;
       this.height += height;
       for (var i = 0, e = this.children.length; i < e; ++i) {
         var child = this.children[i], sz = child.chunkSize();
         if (at <= sz) {
           child.insertHeight(at, lines, height);
           if (child.lines && child.lines.length > 50) {
             while (child.lines.length > 50) {
               var spilled = child.lines.splice(child.lines.length - 25, 25);
               var newleaf = new LeafChunk(spilled);
               child.height -= newleaf.height;
               this.children.splice(i + 1, 0, newleaf);
               newleaf.parent = this;
+            }
             this.maybeSpill();
+          }
           break;
+        }
         at -= sz;
+      }
     },
     maybeSpill: function() {
       if (this.children.length <= 10) return;
       var me = this;
       do {
         var spilled = me.children.splice(me.children.length - 5, 5);
         var sibling = new BranchChunk(spilled);
         if (!me.parent) { // Become the parent node
           var copy = new BranchChunk(me.children);
           copy.parent = me;
           me.children = [copy, sibling];
           me = copy;
         } else {
           me.size -= sibling.size;
           me.height -= sibling.height;
           var myIndex = indexOf(me.parent.children, me);
           me.parent.children.splice(myIndex + 1, 0, sibling);
+        }
         sibling.parent = me.parent;
       } while (me.children.length > 10);
       me.parent.maybeSpill();
     },
     iter: function(from, to, op) { this.iterN(from, to - from, op); },
     iterN: function(at, n, op) {
       for (var i = 0, e = this.children.length; i < e; ++i) {
         var child = this.children[i], sz = child.chunkSize();
         if (at < sz) {
           var used = Math.min(n, sz - at);
           if (child.iterN(at, used, op)) return true;
           if ((n -= used) == 0) break;
           at = 0;
         } else at -= sz;
+      }
+    }
   };
   function getLineAt(chunk, n) {
     while (!chunk.lines) {
       for (var i = 0;; ++i) {
         var child = chunk.children[i], sz = child.chunkSize();
         if (n < sz) { chunk = child; break; }
         n -= sz;
+      }
+    }
     return chunk.lines[n];
+  }
   function lineNo(line) {
     if (line.parent == null) return null;
     var cur = line.parent, no = indexOf(cur.lines, line);
     for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
       for (var i = 0, e = chunk.children.length; ; ++i) {
         if (chunk.children[i] == cur) break;
         no += chunk.children[i].chunkSize();
+      }
+    }
     return no;
+  }
   function lineAtHeight(chunk, h) {
     var n = 0;
     outer: do {
       for (var i = 0, e = chunk.children.length; i < e; ++i) {
         var child = chunk.children[i], ch = child.height;
         if (h < ch) { chunk = child; continue outer; }
         h -= ch;
         n += child.chunkSize();
+      }
       return n;
     } while (!chunk.lines);
     for (var i = 0, e = chunk.lines.length; i < e; ++i) {
       var line = chunk.lines[i], lh = line.height;
       if (h < lh) break;
       h -= lh;
+    }
     return n + i;
+  }
   function heightAtLine(chunk, n) {
     var h = 0;
     outer: do {
       for (var i = 0, e = chunk.children.length; i < e; ++i) {
         var child = chunk.children[i], sz = child.chunkSize();
         if (n < sz) { chunk = child; continue outer; }
         n -= sz;
         h += child.height;
+      }
       return h;
     } while (!chunk.lines);
     for (var i = 0; i < n; ++i) h += chunk.lines[i].height;
     return h;
+  }
   // The history object 'chunks' changes that are made close together
   // and at almost the same time into bigger undoable units.
   function History() {
     this.time = 0;
     this.done = []; this.undone = [];
     this.compound = 0;
     this.closed = false;
+  }
   History.prototype = {
     addChange: function(start, added, old) {
       this.undone.length = 0;
       var time = +new Date, last = this.done[this.done.length - 1];
       if (time - this.time > 400 || !last ||
           last.start > start + added || last.start + last.added < start - last.added + last.old.length)
         this.done.push({start: start, added: added, old: old});
       else {
         var oldoff = 0;
         if (start < last.start) {
           for (var i = last.start - start - 1; i >= 0; --i)
             last.old.unshift(old[i]);
           last.added += last.start - start;
           last.start = start;
+        }
         else if (last.start < start) {
           oldoff = start - last.start;
           added += oldoff;
+        }
         for (var i = last.added - oldoff, e = old.length; i < e; ++i)
           last.old.push(old[i]);
         if (last.added < added) last.added = added;
       var time = +new Date, cur = this.done[this.done.length - 1], last = cur && cur[cur.length - 1];
       var dtime = time - this.time;
       if (this.compound && cur && !this.closed) {
         cur.push({start: start, added: added, old: old});
       } else if (dtime > 400 || !last || this.closed ||
                  last.start > start + old.length || last.start + last.added < start) {
         this.done.push([{start: start, added: added, old: old}]);
         this.closed = false;
       } else {
         var startBefore = Math.max(0, last.start - start),
             endAfter = Math.max(0, (start + old.length) - (last.start + last.added));
         for (var i = startBefore; i > 0; --i) last.old.unshift(old[i - 1]);
         for (var i = endAfter; i > 0; --i) last.old.push(old[old.length - i]);
         if (startBefore) last.start = start;
         last.added += added - (old.length - startBefore - endAfter);
+      }
       this.time = time;
     },
     startCompound: function() {
       if (!this.compound++) this.closed = true;
     },
     endCompound: function() {
       if (!--this.compound) this.closed = true;
+    }
   };
@@ @@ -2107,6 +2937,10 @@ var CodeMirror = (function() { @@
     else e.cancelBubble = true;
+  }
   function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
   CodeMirror.e_stop = e_stop;
   CodeMirror.e_preventDefault = e_preventDefault;
   CodeMirror.e_stopPropagation = e_stopPropagation;
   function e_target(e) {return e.target || e.srcElement;}
   function e_button(e) {
     if (e.which) return e.which;
@@ @@ -2115,60 +2949,76 @@ var CodeMirror = (function() { @@
     else if (e.button & 4) return 2;
+  }
   // Allow 3rd-party code to override event properties by adding an override
   // object to an event object.
   function e_prop(e, prop) {
     var overridden = e.override && e.override.hasOwnProperty(prop);
     return overridden ? e.override[prop] : e[prop];
+  }
   // Event handler registration. If disconnect is true, it'll return a
   // function that unregisters the handler.
   function connect(node, type, handler, disconnect) {
     function wrapHandler(event) {handler(event || window.event);}
     if (typeof node.addEventListener == "function") {
       node.addEventListener(type, wrapHandler, false);
       if (disconnect) return function() {node.removeEventListener(type, wrapHandler, false);};
+    }
     else {
       node.addEventListener(type, handler, false);
       if (disconnect) return function() {node.removeEventListener(type, handler, false);};
     } else {
       var wrapHandler = function(event) {handler(event || window.event);};
       node.attachEvent("on" + type, wrapHandler);
       if (disconnect) return function() {node.detachEvent("on" + type, wrapHandler);};
+    }
+  }
   CodeMirror.connect = connect;
   function Delayed() {this.id = null;}
   Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
   // Some IE versions don't preserve whitespace when setting the
   // innerHTML of a PRE tag.
   var badInnerHTML = (function() {
     var pre = document.createElement("pre");
     pre.innerHTML = " "; return !pre.innerHTML;
   })();
   // Detect drag-and-drop
   var dragAndDrop = (function() {
     // IE8 has ondragstart and ondrop properties, but doesn't seem to
     // actually support ondragstart the way it's supposed to work.
     if (/MSIE [1-8]\b/.test(navigator.userAgent)) return false;
     var div = document.createElement('div');
     return "ondragstart" in div && "ondrop" in div;
   })();
   var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
   var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
   var ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
   var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
   var quirksMode = ie && document.documentMode == 5;
   var webkit = /WebKit\//.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
   var opera = /Opera\//.test(navigator.userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
   var khtml = /KHTML\//.test(navigator.userAgent);
   var mac_geLion = /Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent);
   var lineSep = "\n";
   // Detect drag-and-drop
   var dragAndDrop = function() {
     // There is *some* kind of drag-and-drop support in IE6-8, but I
     // couldn't get it to work yet.
     if (ie_lt9) return false;
     var div = document.createElement('div');
     return "draggable" in div || "dragDrop" in div;
   }();
   // Feature-detect whether newlines in textareas are converted to \r\n
-  (function () {
+  var lineSep = function () {
     var te = document.createElement("textarea");
     te.value = "foo\nbar";
     if (te.value.indexOf("\r") > -1) lineSep = "\r\n";
   }());
     if (te.value.indexOf("\r") > -1) return "\r\n";
     return "\n";
   }();
   var tabSize = 8;
   var mac = /Mac/.test(navigator.platform);
   var movementKeys = {};
   for (var i = 35; i <= 40; ++i)
     movementKeys[i] = movementKeys["c" + i] = true;
   // For a reason I have yet to figure out, some browsers disallow
   // word wrapping between certain characters *only* if a new inline
   // element is started between them. This makes it hard to reliably
   // measure the position of things, since that requires inserting an
   // extra span. This terribly fragile set of regexps matches the
   // character combinations that suffer from this phenomenon on the
   // various browsers.
   var spanAffectsWrapping = /^$/; // Won't match any two-character string
   if (gecko) spanAffectsWrapping = /$'/;
   else if (safari) spanAffectsWrapping = /\-[^ \-?]|\?[^ !'\"\),.\-\/:;\?\]\}]/;
   else if (chrome) spanAffectsWrapping = /\-[^ \-\.?]|\?[^ \-\.?\]\}:;!'\"\),\/]|[\.!\"#&%\)*+,:;=>\]|\}~][\(\{\[<]|\$'/;
   // Counts the column offset in a string, taking tabs into account.
   // Used mostly to find indentation.
   function countColumn(string, end) {
+  function countColumn(string, end, tabSize) {
     if (end == null) {
       end = string.search(/[^\s\u00a0]/);
       if (end == -1) end = string.length;
@@ @@ -2184,25 +3034,54 @@ var CodeMirror = (function() { @@
     if (elt.currentStyle) return elt.currentStyle;
     return window.getComputedStyle(elt, null);
+  }
   // Find the position of an element by following the offsetParent chain.
   // If screen==true, it returns screen (rather than page) coordinates.
   function eltOffset(node, screen) {
     var doc = node.ownerDocument.body;
     var x = 0, y = 0, skipDoc = false;
     var bod = node.ownerDocument.body;
     var x = 0, y = 0, skipBody = false;
     for (var n = node; n; n = n.offsetParent) {
       x += n.offsetLeft; y += n.offsetTop;
       var ol = n.offsetLeft, ot = n.offsetTop;
       // Firefox reports weird inverted offsets when the body has a border.
       if (n == bod) { x += Math.abs(ol); y += Math.abs(ot); }
       else { x += ol, y += ot; }
       if (screen && computedStyle(n).position == "fixed")
-        skipDoc = true;
+        skipBody = true;
+    }
-    var e = screen && !skipDoc ? null : doc;
+    var e = screen && !skipBody ? null : bod;
     for (var n = node.parentNode; n != e; n = n.parentNode)
       if (n.scrollLeft != null) { x -= n.scrollLeft; y -= n.scrollTop;}
     return {left: x, top: y};
+  }
   // Use the faster and saner getBoundingClientRect method when possible.
   if (document.documentElement.getBoundingClientRect != null) eltOffset = function(node, screen) {
     // Take the parts of bounding client rect that we are interested in so we are able to edit if need be,
     // since the returned value cannot be changed externally (they are kept in sync as the element moves within the page)
     try { var box = node.getBoundingClientRect(); box = { top: box.top, left: box.left }; }
     catch(e) { box = {top: 0, left: 0}; }
     if (!screen) {
       // Get the toplevel scroll, working around browser differences.
       if (window.pageYOffset == null) {
         var t = document.documentElement || document.body.parentNode;
         if (t.scrollTop == null) t = document.body;
         box.top += t.scrollTop; box.left += t.scrollLeft;
       } else {
         box.top += window.pageYOffset; box.left += window.pageXOffset;
+      }
+    }
     return box;
   };
   // Get a node's text content.
   function eltText(node) {
     return node.textContent || node.innerText || node.nodeValue || "";
+  }
   function selectInput(node) {
     if (ios) { // Mobile Safari apparently has a bug where select() is broken.
       node.selectionStart = 0;
       node.selectionEnd = node.value.length;
     } else node.select();
+  }
   // Operations on {line, ch} objects.
   function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}
@@ @@ -2211,21 +3090,30 @@ var CodeMirror = (function() { @@
   var escapeElement = document.createElement("pre");
   function htmlEscape(str) {
     if (badTextContent) {
     escapeElement.textContent = str;
     return escapeElement.innerHTML;
+  }
   // Recent (late 2011) Opera betas insert bogus newlines at the start
   // of the textContent, so we strip those.
   if (htmlEscape("a") == "\na") {
     htmlEscape = function(str) {
       escapeElement.textContent = str;
       return escapeElement.innerHTML.slice(1);
     };
   // Some IEs don't preserve tabs through innerHTML
   } else if (htmlEscape("\t") != "\t") {
     htmlEscape = function(str) {
       escapeElement.innerHTML = "";
       escapeElement.appendChild(document.createTextNode(str));
     } else {
       escapeElement.textContent = str;
+    }
     return escapeElement.innerHTML;
       return escapeElement.innerHTML;
     };
+  }
   var badTextContent = htmlEscape("\t") != "\t";
   CodeMirror.htmlEscape = htmlEscape;
   // Used to position the cursor after an undo/redo by finding the
   // last edited character.
   function editEnd(from, to) {
-    if (!to) return from ? from.length : 0;
     if (!to) return 0;
     if (!from) return to.length;
     for (var i = from.length, j = to.length; i >= 0 && j >= 0; --i, --j)
       if (from.charAt(i) != to.charAt(j)) break;
@@ @@ -2238,95 +3126,54 @@ var CodeMirror = (function() { @@
       if (collection[i] == elt) return i;
     return -1;
+  }
   function isWordChar(ch) {
     return /\w/.test(ch) || ch.toUpperCase() != ch.toLowerCase();
+  }
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
   var splitLines, selRange, setSelRange;
   if ("\n\nb".split(/\n/).length != 3)
     splitLines = function(string) {
       var pos = 0, nl, result = [];
       while ((nl = string.indexOf("\n", pos)) > -1) {
         result.push(string.slice(pos, string.charAt(nl-1) == "\r" ? nl - 1 : nl));
         pos = nl + 1;
+      }
       result.push(string.slice(pos));
       return result;
     };
   else
     splitLines = function(string){return string.split(/\r?\n/);};
   var splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
     var pos = 0, nl, result = [];
     while ((nl = string.indexOf("\n", pos)) > -1) {
       result.push(string.slice(pos, string.charAt(nl-1) == "\r" ? nl - 1 : nl));
       pos = nl + 1;
+    }
     result.push(string.slice(pos));
     return result;
   } : function(string){return string.split(/\r?\n/);};
   CodeMirror.splitLines = splitLines;
   // Sane model of finding and setting the selection in a textarea
   if (window.getSelection) {
     selRange = function(te) {
       try {return {start: te.selectionStart, end: te.selectionEnd};}
       catch(e) {return null;}
     };
     if (safari)
       // On Safari, selection set with setSelectionRange are in a sort
       // of limbo wrt their anchor. If you press shift-left in them,
       // the anchor is put at the end, and the selection expanded to
       // the left. If you press shift-right, the anchor ends up at the
       // front. This is not what CodeMirror wants, so it does a
       // spurious modify() call to get out of limbo.
       setSelRange = function(te, start, end) {
         if (start == end)
           te.setSelectionRange(start, end);
         else {
           te.setSelectionRange(start, end - 1);
           window.getSelection().modify("extend", "forward", "character");
+        }
       };
     else
       setSelRange = function(te, start, end) {
         try {te.setSelectionRange(start, end);}
         catch(e) {} // Fails on Firefox when textarea isn't part of the document
       };
+  }
   // IE model. Don't ask.
   else {
     selRange = function(te) {
       try {var range = te.ownerDocument.selection.createRange();}
       catch(e) {return null;}
       if (!range || range.parentElement() != te) return null;
       var val = te.value, len = val.length, localRange = te.createTextRange();
       localRange.moveToBookmark(range.getBookmark());
       var endRange = te.createTextRange();
       endRange.collapse(false);
       if (localRange.compareEndPoints("StartToEnd", endRange) > -1)
         return {start: len, end: len};
       var start = -localRange.moveStart("character", -len);
       for (var i = val.indexOf("\r"); i > -1 && i < start; i = val.indexOf("\r", i+1), start++) {}
       if (localRange.compareEndPoints("EndToEnd", endRange) > -1)
         return {start: start, end: len};
       var end = -localRange.moveEnd("character", -len);
       for (var i = val.indexOf("\r"); i > -1 && i < end; i = val.indexOf("\r", i+1), end++) {}
       return {start: start, end: end};
     };
     setSelRange = function(te, start, end) {
       var range = te.createTextRange();
       range.collapse(true);
       var endrange = range.duplicate();
       var newlines = 0, txt = te.value;
       for (var pos = txt.indexOf("\n"); pos > -1 && pos < start; pos = txt.indexOf("\n", pos + 1))
         ++newlines;
       range.move("character", start - newlines);
       for (; pos > -1 && pos < end; pos = txt.indexOf("\n", pos + 1))
         ++newlines;
       endrange.move("character", end - newlines);
       range.setEndPoint("EndToEnd", endrange);
       range.select();
     };
+  }
   var hasSelection = window.getSelection ? function(te) {
     try { return te.selectionStart != te.selectionEnd; }
     catch(e) { return false; }
   } : function(te) {
     try {var range = te.ownerDocument.selection.createRange();}
     catch(e) {}
     if (!range || range.parentElement() != te) return false;
     return range.compareEndPoints("StartToEnd", range) != 0;
   };
   CodeMirror.defineMode("null", function() {
     return {token: function(stream) {stream.skipToEnd();}};
   });
   CodeMirror.defineMIME("text/plain", "null");
   var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
 : "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
 : "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
 : "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 109: "-", 107: "=", 127: "Delete",
 : ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
 : "]", 222: "'", 63276: "PageUp", 63277: "PageDown", 63275: "End", 63273: "Home",
 : "Left", 63232: "Up", 63235: "Right", 63233: "Down", 63302: "Insert", 63272: "Delete"};
   CodeMirror.keyNames = keyNames;
   (function() {
     // Number keys
     for (var i = 0; i < 10; i++) keyNames[i + 48] = String(i);
     // Alphabetic keys
     for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
     // Function keys
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
   return CodeMirror;
 })();

0 comments (0 inline, 0 general)