update
Merge branch 'master' of https://github.com/hiroaki49/emacs