emacs - move variables out of custom and into def