[COMMIT] Re: Add a correct version of the (featurep 'xemacs) optimisation