for macos
for mac os
Merge branch 'master' of https://git.zzhang.org/emacs.d

Conflicts:
	config/latex.el
	init.el