Enable alternative tokens by default for clang-format.

Patch by Bobby Moretti.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@208269 91177308-0d34-0410-b5e6-96231b3b80d8
Fix latent bug. This can't actually manifest at the moment, but is a time-bomb
for the next time someone adds something to this function.


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@208270 91177308-0d34-0410-b5e6-96231b3b80d8