Skip to content

Test against 24.4 #75

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 21, 2015
Merged

Test against 24.4 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94d687d
Add required ELPA source
Jan 21, 2015
52045f0
Fix issues with several failing tests on emacs 24.4
Jan 21, 2015
230afd3
Setup travis matrix with emacs 24.3 and 24.4.
Jan 21, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
language: emacs-lisp

env:
- EMACS=emacs24 PATH="$HOME/.cask/bin:$PATH"
- EVM_EMACS=emacs-24.3-bin
- EVM_EMACS=emacs-24.4-bin

install:
- sudo add-apt-repository -y ppa:cassou/emacs
- sudo apt-get update -qq
- sudo apt-get install -qq emacs24 emacs24-el
- sudo apt-get install texinfo
- curl -fsSkL https://raw.github.com/cask/cask/master/go | python
before_install:
- sudo mkdir /usr/local/evm
- sudo chown travis:travis /usr/local/evm
- curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
- export PATH="/home/travis/.evm/bin:$PATH"
- evm install $EVM_EMACS --skip --use
- curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
- export PATH="/home/travis/.cask/bin:$PATH"
- cask info
- cask install
- emacs --version
- cask --version

script:
- make
Expand Down
1 change: 1 addition & 0 deletions Cask
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(source melpa)
(source gnu)
(source org)

(package-file "swift-mode.el")
Expand Down
4 changes: 2 additions & 2 deletions swift-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,14 @@
(`(:before . ".")
(if (or (looking-at "[.][\n]")
(smie-rule-bolp))
(smie-rule-parent swift-indent-multiline-statement-offset)))
swift-indent-multiline-statement-offset))

;; Apply swift-indent-multiline-statement-offset if
;; operator is the last symbol on the line
(`(:before . "OP")
(if (and (looking-at ".[\n]")
(not (smie-rule-sibling-p)))
(smie-rule-parent swift-indent-multiline-statement-offset)))
swift-indent-multiline-statement-offset))

;; Indent second line of the multi-line class
;; definitions with swift-indent-offset
Expand Down