Let git generate better diffs for obj-c
Merge branch 'develop' of github.com:JugglerShu/XVim into develop

* 'develop' of github.com:JugglerShu/XVim: