[RFC] vim-patch:7.4.169

Merging [vim patch](https://code.google.com/p/vim/source/detail?r=4e3a9dd25d428e7c08ed401afc244972e27e08e6)