From db374c54d6e453d40d2a7a617a8977b72074a1d1 Mon Sep 17 00:00:00 2001
From: John Kitchin <jkitchin@andrew.cmu.edu>
Date: Mon, 20 Apr 2015 20:10:45 -0400
Subject: [PATCH] change to be consistent with
 http://oremacs.com/2015/03/30/elisp-ert-travis/ because the  build is
 currently broken

---
 .travis.yml | 16 ++++++++--------
 Makefile    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f94d83..d51906f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,20 @@
 language: emacs-lisp
+
+env:
+  matrix:
+    - emacs=emacs-snapshot
+
 before_install:
-  # PPA for stable Emacs packages
-  - sudo add-apt-repository -y ppa:cassou/emacs
-  # PPA for Emacs nightlies
   - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa
-  # Update and install the Emacs for our environment
   - sudo apt-get update -qq
-  - sudo apt-get install -qq -yy ${EMACS}-nox ${EMACS}-el
+  - sudo apt-get install -qq $emacs
+
   # Install cask dependencies
   - curl -fsSLo /tmp/cask-master.zip https://github.com/cask/cask/archive/master.zip
   - sudo unzip -qq -d /opt /tmp/cask-master.zip
   - sudo ln -sf /opt/cask-master/bin/cask /usr/local/bin/cask
   - cask
-env:
-#  - EMACS=emacs24
-  - EMACS=emacs-snapshot
+
 script:
   - emacs --version
   - make test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e2855ae..8ec4b8e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EMACS ?= emacs
+emacs ?= emacs
 CASK ?= cask
 CASK_EXEC ?= ${CASK} exec
 EL_SOURCES = org-ref.el arxiv.el jmax-bibtex.el doi-utils.el isbn.el pubmed.el
@@ -10,10 +10,10 @@ test: clean-elc
 	${MAKE} unit
 
 unit:
-	${CASK_EXEC} ${EMACS} -Q -batch -l org-ref.el -l org-ref-test.el --eval "(ert t)"
+	${CASK_EXEC} ${emacs} -Q -batch -l org-ref.el -l org-ref-test.el --eval "(ert t)"
 
 compile:
-	${CASK_EXEC} ${EMACS} -Q -batch -f batch-byte-compile *.el
+	${CASK_EXEC} ${emacs} -Q -batch -f batch-byte-compile *.el
 
 clean-elc:
 	rm -f *.elc
-- 
2.39.2