Hi robinson. Like #7616 (closed) I'm having a bit of trouble applying this patch too (oddly 'git am' prompts me to resolve the conflict, but doesn't leave a conflict in my working tree to resolve). Pulling from a branch would make this far easier. :)
I have uploaded a fixed patch. I believe a pull from a repo would have failed also, but you would have been able to see why. I will look into setting up a public repo, soon.
This version of the patch originates from the Stem main repo master branch, so should work correctly. The previous version was based in a context where I had modelines in each file to conform to the Stem project's white space policy. I moved that configuration to a single .kateconfig file.
Trac: Username: robinson Keywords: N/Adeleted, test added