[nongnu] elpa/swift-mode e859716 176/496: Merge pull request #75 from ap4y/test_against_24_4

[ELPA Syncer]

branch: elpa/swift-mode
commit e8597162d44dca79503a1bee461da4976faab864
Merge: 250e8e4 230afd3
Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Commit: Bozhidar Batsov <bozhidar.batsov@gmail.com>

    Merge pull request #75 from ap4y/test_against_24_4
    
    Test against 24.4
---
 .travis.yml   | 22 +++++++++++++++-------
 Cask          |  1 +
 swift-mode.el |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db7beeb..a066c7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/Cask b/Cask
index 5159dbb..01fa162 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,5 @@
 (source melpa)
+(source gnu)
 (source org)
 
 (package-file "swift-mode.el")
diff --git a/swift-mode.el b/swift-mode.el
index b58bb25..3fd39d0 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -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