split no-highlight conditions

common/python/nomadcore/match_highlighter.py

@@ -19,9 +19,13 @@ class MatchHighlighter(object):
         self.highlightMode=highlightMode
     
     def highlight(self,match,lineOrig):
-        # shortcut: there is nothing to highlight
-        if (not match) or (self.highlightMode==0):
+        # shortcut: we don't want highlighting
+        if (self.highlightMode == 0):
             return(lineOrig)
+
+        # shortcut: there is nothing to highlight
+        if not match:
+            return lineOrig
         # list with the highlight switching events
         # tuples: (pos, event, ansi)
         #   event: