Many of your modified lines appear to be mis-indented.  It looks like your text editor may be inserting tab characters instead of spaces.  Could you re-indent your modified lines by replacing each tab with four spaces?  (if you're a `vi` user, you can do this with `:expandtab` and `:retab`).