update emacs tricks
revert file from master