mod: update from upstream
Merge branch 'master' of github.com:vietor/emacs.d