Use $EMACS_COMMAND rather than just $EMACS (see #1855)