Log Message: Add emacs25, xemacs21[45]nox for makevars.map Thanks wiz@ for OK. I don't believe we need emacs25nox ;-(