removed: diff settings
fixed: restore major-mode
Merge branch 'master' of github.com:ncaq/.emacs.d