Skip to content

Commit

Permalink
Merge pull request #266 from phillord/feature/travis-update
Browse files Browse the repository at this point in the history
Use EVM for travis, test recent Emacs
  • Loading branch information
phillord authored Mar 10, 2018
2 parents 48a5015 + 3789b15 commit 87d5fea
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 2,559 deletions.
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
language: emacs-lisp
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: no
env:
- EMACS=emacs23
- EMACS=emacs24
- EMACS=emacs-snapshot
- EVM_EMACS=emacs-24.1-travis
- EVM_EMACS=emacs-24.2-travis
- EVM_EMACS=emacs-24.3-travis
- EVM_EMACS=emacs-24.4-travis
- EVM_EMACS=emacs-24.5-travis
- EVM_EMACS=emacs-25.1-travis
- EVM_EMACS=emacs-25.2-travis
- EVM_EMACS=emacs-25.3-travis
- EVM_EMACS=emacs-26-pretest-travis
- EVM_EMACS=emacs-git-snapshot-travis
install:
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > travis.sh && source ./travis.sh
- evm install $EVM_EMACS --use --skip
script:
./run-travis-ci.sh
6 changes: 4 additions & 2 deletions dash.el
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,8 @@ See also: `-last-item'."
(declare (pure t) (side-effect-free t))
(car (cdr (cdr (cdr (cdr list))))))

;; TODO: emacs23 support, when dropped remove the condition
;; TODO: gv was introduced in 24.3, so we can remove the if statement
;; when support for earlier versions is dropped
(eval-when-compile
(require 'cl)
(if (fboundp 'gv-define-simple-setter)
Expand All @@ -665,7 +666,8 @@ See also: `-last-item'."
(declare (pure t) (side-effect-free t))
(car (last list)))

;; TODO: emacs23 support, when dropped remove the condition
;; TODO: gv was introduced in 24.3, so we can remove the if statement
;; when support for earlier versions is dropped
(eval-when-compile
(if (fboundp 'gv-define-setter)
(gv-define-setter -last-item (val x) `(setcar (last ,x) ,val))
Expand Down
Loading

0 comments on commit 87d5fea

Please sign in to comment.