There was a bug in the tracker about losing highlight when you indent/Unindent.
I summitted this patch to the mailing list twice, the bug was removed from the tracker but the patch never apply.

The patch fixes up how it indents and unindents, and un/commints. as well as cleans up some of my code.