Fix bug with multi-term in latest emacs build