While I remember, and as discussed a few times in the past, when you create the new 1.3.0 trunk how about running the whole thing through a code beautifier?
The time to do it would be before creating the branch, otherwise porting fixes from one branch to the other will be painful. Since the change is theoretically whitespace only, this should be OK.
IIRC we discussed this last time, I looked at a few beautifiers and didn't find one that would immediately do what I wanted without some additional work, so put it off due to lack of time. I am still open to doing this.
Also, some files (like autoiso.c) seem to have trailing carriage return ( ^M) so it wouldn't be bad to nuke those too.
All .c files should have eol-style set to "native" for automatic line ending conversion. This one slipped through, should be fixed now.
Previous code formatting discussion http://chdk.setepontos.com/index.php?topic=2145.msg36658#msg36658
From the 1.1. release thread http://chdk.setepontos.com/index.php?topic=8309.0
the reason I didn't do it then was mainly that there were a couple of developer branches open, so it would have messed up merging. I remember I looked at a couple of different tools, but I don't see any posts about them. I'll look around and see if I have any notes.
edit: Some tools I looked at were
Universal indent gui http://universalindent.sourceforge.net/