tweak zsh vi mode
merge upstream