Make sure we run the right version of Emacs in travis.

.travis.yml

@@ -7,7 +7,7 @@ before_install:
           emacs-snapshot-el emacs-snapshot-gtk emacs-snapshot;
     fi
 env:
-  - EMACS=emacs
-  - EMACS=emacs-snapshot
+  - ECUKES_EMACS=emacs
+  - ECUKES_EMACS=emacs-snapshot
 script:
   ./run-travis-ci.sh

run-travis-ci.sh

@@ -10,11 +10,11 @@ fi
 "
 }
 
-set_default EMACS "$(which emacs)"
+set_default ECUKES_EMACS "$(which emacs)"
 
 echo "*** Emacs version ***"
-echo "EMACS =" $(which $EMACS)
-$EMACS --version
+echo "ECUKES_EMACS =" $(which $ECUKES_EMACS)
+$ECUKES_EMACS --version
 echo
 
 exec ./util/ecukes/ecukes --graphical