updated for vim7.4