HighlighterKit: integrate changes from svn r97215

https://trac.macports.org/changeset/97215