[PATCH v4] emacs: logically group def{custom,face}s