zsh: fixes after my first zsh upgrade.
emacs: add expand-region