I've attached a patch which is essentially the same as Eric's suggestion
except that, the original comment is kept, the HOW argument of
`font-lock-add-keywords' is set to t, and the code is restructured to
avoid any font-lock changes until `font-lock-mode' is active.

-- 
Morgan Willcock