[SVN] Bundle commit 277

> For now, I'll just add the preprocessor changes to the C and C++
> preprocessor, so that all the C-family languages are on the same page.
Actually, no. Using this, a couple of things came up:
(1) The reason I originally didn't use Xcode-style highlighting for
preprocessor lines was that it gets comments "wrong":
#import "Enjoy.h" // this comment is colored the same as the rest of
the line! yuck!
(2) I really don't like the contrast between normal statements and
preprocessor statements being reduced that much.
Chris