Use evm in build.

diff --git a/.travis.yml b/.travis.yml
index a732f679e72f8685dc5264e8afb07be46b5896b8..8a9d303d3abb40f7171ebee80fa1cefbd47569cf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
-# https://github.com/rolandwalker/emacs-travis
-
 language: emacs-lisp
 
 node_js:
   - "0.10"
 
 env:
-  matrix:
-    - EMACS=emacs24
+  - EVM_EMACS=emacs-24.3-bin
+  - EVM_EMACS=emacs-24.4-bin
+  - EVM_EMACS=emacs-24.5-bin
 
-install:
-  - if [ "$EMACS" = "emacs24" ]; then
-        sudo add-apt-repository -y ppa:cassou/emacs &&
-        sudo apt-get update -qq &&
-        sudo apt-get install -qq emacs24 emacs24-el;
-    fi
-  - curl -fsSL https://raw.github.com/cask/cask/master/go | python
+before_install:
+  - sudo mkdir /usr/local/evm
+  - sudo chown travis:travis /usr/local/evm
   - export PATH="/home/travis/.cask/bin:$PATH"
+  - export PATH="/home/travis/.evm/bin:$PATH"
+  - curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
+  - evm install ${EVM_EMACS} --use
+  - curl -fsSkL https://raw.github.com/cask/cask/master/go | python
+  - cask
   - npm install -g scopifier
 
 script:
-  make test EMACS=${EMACS}
+  - emacs --version
+  - make test

diff --git a/README.md b/README.md
index 0ced14cb416503466f4d04065274e6dc5f398f6f..6e8865f240a3e56ec6b169fd708b1e6e89b0a547 100644 (file)
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ By default, comments and strings are still highlighted syntactically.
 
 ## Installation
 
-Requires Emacs 24+.
+Requires Emacs 24.3+.
 
 JavaScript language support requires either [js2-mode][], or
 [Node.js 0.10+][node] and the [scopifier][] executable.