revise the macros for vim