update mapping for vim and update upstrem for emacsd