my emacs configure file
Merge commit 'd1d4ec9'