save for if-emacs-24.3
Merge branch 'master' of https://github.com/zhoujd/zzemacs