Merge branch 'refs/heads/master' into v0.7.1

1 files changed, 1 insertions, 1 deletions

diff --git a/imports/codemirror/lib/util/match-highlighter.js b/imports/codemirror/lib/util/match-highlighter.js
index b70cc4cf..59098ff8 100644
--- a/imports/codemirror/lib/util/match-highlighter.js
+++ b/imports/codemirror/lib/util/match-highlighter.js
@@ -23,7 +23,7 @@
   function markDocument(cm, className, minChars) {
     clearMarks(cm);
         minChars = (typeof minChars !== 'undefined' ? minChars : DEFAULT_MIN_CHARS);
-        if (cm.somethingSelected() && cm.getSelection().length >= minChars) {
+        if (cm.somethingSelected() && cm.getSelection().replace(/^\s+|\s+$/g, "").length >= minChars) {
                 var state = getMatchHighlightState(cm);
                 var query = cm.getSelection();
                 cm.operation(function() {