added changes from previous emacs.d