diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4568673e3c4c2e89352b5729482ae0a4a31bc071..d08aa67f67095b803859b8b30e00eb930ec65caf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7962,7 +7962,7 @@
   }
 
   // Register a change in the history. Merges changes that are within
-  // a single operation, ore are close together with an origin that
+  // a single operation, or are close together with an origin that
   // allows merging (starting with "+") into a single event.
   function addChangeToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;