zsh: add grep alias 'grep -n'
Merge branch 'master' into wip
emacs: use M-: or M-/ that is the question