merge for shell
Merge branch 'master' of https://github.com/zhoujd/zzemacs