Changes to suit latest ert structure. ERT is now a part of EMACS and the source of...