GenericHighlighter: Update from latest KTextEditor source

Change-Id: If31df61e1e4aa7133d6384e91a362405149c2883
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>