vim: patches have been incorporated upstream