Fix highlighting in Form Mode.
Merge branch 'master' of github.com:gareth-rees/p4.el