cvs-conflict 1.7 - xemacs byte compile fixed