update for git difftool
Merge branch 'master' of https://github.com/zhoujd/zzemacs
format code