MOved custom out of emacs.el