marijnh/CodeMirror2 — pull request #396 by paulyg (2012-02-26 05:16:52+00:00)
Title: Changes to keywords in PHP mode.

A missing space between "return" and "die" was causing both to not get
highlighted. While in there I removed "cfunction" as it was PHP4 only,
added "trait" (coming in 5.4), and added "__halt_compiler", "self",
"static", and "parent".