Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Feature/coverall integration #195

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 15 additions & 12 deletions .travis.yml
@@ -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-git-snapshot-travis
install:
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > travis.sh && source ./travis.sh
- evm install $EVM_EMACS --use --skip
- cask
script:
./run-travis-ci.sh
- ./run-tests.sh
6 changes: 6 additions & 0 deletions Cask
@@ -1 +1,7 @@
(source gnu)
(source melpa)

(package-file "dash.el")

(development
(depends-on "undercover"))
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
# <img align="right" src="https://raw.github.com/magnars/dash.el/master/rainbow-dash.png"> dash.el [![Build Status](https://secure.travis-ci.org/magnars/dash.el.png)](http://travis-ci.org/magnars/dash.el)
# <img align="right" src="https://raw.github.com/magnars/dash.el/master/rainbow-dash.png"> dash.el [![Build Status](https://secure.travis-ci.org/magnars/dash.el.png)](http://travis-ci.org/magnars/dash.el) [![Coverage Status](https://coveralls.io/repos/github/magnars/dash.el/badge.svg)](https://coveralls.io/github/magnars/dash.el)

A modern list api for Emacs. No 'cl required.

Expand Down
3 changes: 2 additions & 1 deletion dash.el
Expand Up @@ -1284,7 +1284,8 @@ If a list overflows, carry to the right and reset the list."
(while (not (or (car lists)
(equal lists '(nil))))
(setcar lists (car restore-lists))
(pop (cadr lists))
;; moral equivalent to (pop (cadr lists))
(setcar (cdr lists) (cdr (cadr lists)))
(!cdr lists)
(!cdr restore-lists)
(when re
Expand Down