revert merge
[fanfix.git] / teditor / Highlighter.java