fix
Merge branch 'master' of github.com:xzpeter/.emacs.d