Allow editor-less documents to combine +-origin history events

Closes #5316
codemirror · Mar 20, 2018 · 8a1479b · 8a1479b
1 parent 45d5e05
commit 8a1479b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/model/history.js b/src/model/history.js
@@ -67,7 +67,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
 
   if ((hist.lastOp == opId ||
        hist.lastOrigin == change.origin && change.origin &&
-       ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
+       ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
         change.origin.charAt(0) == "*")) &&
       (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
     // Merge this change into the last event