reverted 4622 codemirror3 because broke zencoding and drops support for IE7, we do not use the new features anyway. Sorry

applications/admin/static/codemirror/lib/util/match-highlighter.js

@@ -1,5 +1,5 @@
 // Define match-highlighter commands. Depends on searchcursor.js
-// Use by attaching the following function call to the cursorActivity event:
+// Use by attaching the following function call to the onCursorActivity event:
 	//myCodeMirror.matchHighlight(minChars);
 // And including a special span.CodeMirror-matchhighlight css class (also optionally a separate one for .CodeMirror-focused -- see demo matchhighlighter.html)
 
@@ -30,10 +30,8 @@
 			if (cm.lineCount() < 2000) { // This is too expensive on big documents.
 			  for (var cursor = cm.getSearchCursor(query); cursor.findNext();) {
 				//Only apply matchhighlight to the matches other than the one actually selected
-				if (cursor.from().line !== cm.getCursor(true).line ||
-                                    cursor.from().ch !== cm.getCursor(true).ch)
-					state.marked.push(cm.markText(cursor.from(), cursor.to(),
-                                                                      {className: className}));
+				if (!(cursor.from().line === cm.getCursor(true).line && cursor.from().ch === cm.getCursor(true).ch))
+					state.marked.push(cm.markText(cursor.from(), cursor.to(), className));
 			  }
 			}
 		  });