> How am I supposed to apply the patch? I get this:
 >
 > $ git apply txtC00XwS8xFx.txt
 > error: corrupt patch at line 9

Which operating system?  What does

git apply txtC00XwS8xFx.txt --verbose

give?

 > I think I had that same issue with your earlier patch, but it was small
 > enough that I could edit by hand.

Are you sure you are on master?

martin