keyword: make the templater a local variable
After
6722ba3bf80b a class attribute makes no sense.
patch: don't look for headers in diff lines
If you have a diff line that matches a header line, the patch splitter
currently breaks your patch at this line. For example a line like:
+key: value
This can lead to "malformed patch" exceptions. Now fixed.