sync with the base .emacs.d

update with the base .emacs.d