Merge remote branch 'upstream/master'

This commit is contained in:
c-spencer 2011-05-23 10:50:21 +01:00
commit 53fb2a3562
14 changed files with 574 additions and 388 deletions

View file

@ -141,6 +141,9 @@ var BackgroundTokenizer = function(tokenizer, editor) {
if (firstRow > 0 && this.lines[firstRow - 1]) {
state = this.lines[firstRow - 1].state;
doCache = true;
} else if (firstRow == 0) {
state = "start";
doCache = true;
}
var lines = this.doc.getLines(firstRow, lastRow);