Fix errors in 24.4

Author: taku0

.travis.yml

@@ -5,13 +5,14 @@ env:
   - EVM_EMACS=emacs-24.4-travis
   - EVM_EMACS=emacs-24.5-travis
   - EVM_EMACS=emacs-25.1-travis
-  - EVM_EMACS=emacs-git-snapshot
+  - EVM_EMACS=emacs-25.2-travis
 
 before_install:
   - curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash
   - export PATH="/home/travis/.evm/bin:$PATH"
   - evm config path /tmp
   - evm install $EVM_EMACS --skip --use
+  - export EMACS=$(evm bin)
   - curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python
   - export PATH="/home/travis/.cask/bin:$PATH"
   - cask info
@@ -21,8 +22,6 @@ before_install:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: EVM_EMACS=emacs-git-snapshot
 
 script:
-  - make test
+  - make deps test

Makefile

@@ -1,7 +1,6 @@
 CASK ?= cask
 EMACS ?= emacs
 VERSION := $(shell EMACS=$(EMACS) $(CASK) version)
-PKG_DIR := $(shell EMACS=$(EMACS) $(CASK) package-directory)
 
 SRC = $(wildcard *.el)
 PACKAGE = dist/swift-mode-$(VERSION).tar
@@ -23,11 +22,9 @@ help:
 all: package
 ## Builds the package.
 
-$(PKG_DIR): ## no-doc
-	$(CASK) install
-
-deps: $(PKG_DIR)
+deps:
 ## Installs the dependencies.
+	$(CASK) install
 
 $(PACKAGE): $(SRC) deps ## no-doc
 	rm -rf dist
@@ -41,13 +38,14 @@ install: package
 	$(CASK) exec $(EMACS) --batch \
 	  -l package \
 	  -f package-initialize \
+	  -f package-refresh-contents \
 	  --eval '(package-install-file "$(PACKAGE)")'
 
 clean:
 ## Cleans the dist directory.
 	rm -rf dist
 
-test: deps
+test:
 ## Tests the package.
 	$(CASK) exec $(EMACS) --batch -q \
 	  --eval "(add-to-list 'load-path \""$(shell readlink -f .)"\")" \

swift-mode-beginning-of-defun.el

@@ -5,7 +5,7 @@
 ;; Authors: taku0 (http://github.com/taku0)
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 
 ;; This file is not part of GNU Emacs.

swift-mode-font-lock.el

@@ -8,7 +8,7 @@
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 
 ;; This file is not part of GNU Emacs.
@@ -48,6 +48,7 @@ Others includes enum, struct, class, protocol name.
 Set `match-data', and return t if a function name found before position LIMIT.
 Return nil otherwise."
   (and
+   (< (point) limit)
    (re-search-forward "\\<\\(\\sw\\|\\s_\\)+\\>" limit t)
    (or
     (swift-mode:function-name-pos-p (match-beginning 0))

swift-mode-indent.el

@@ -8,7 +8,7 @@
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 
 ;; This file is not part of GNU Emacs.

swift-mode-lexer.el

@@ -8,7 +8,7 @@
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 
 ;; This file is not part of GNU Emacs.
@@ -250,6 +250,7 @@ stops where the level becomes zero."
                             '("\"\"\"" "\"" "//" "/*" "(" ")")
                             "\\|")))
     (while (and (not found-matching-parenthesis)
+                (< (point) end)
                 (search-forward-regexp pattern end t))
       (cond
        ((equal "\"\"\"" (match-string-no-properties 0))
@@ -307,7 +308,9 @@ If the string go beyond END, stop there."
 Assuming the cursor is on a string.
 If the string go beyond END, stop there.
 The string should be terminated with QUOTATION."
-  (if (search-forward-regexp (concat (regexp-quote quotation) "\\|(") end t)
+  (if (and
+       (< (point) end)
+       (search-forward-regexp (concat (regexp-quote quotation) "\\|(") end t))
       (cond
        ((and (equal quotation (match-string-no-properties 0))
              (not (swift-mode:escaped-p (match-beginning 0))))

swift-mode-repl.el

@@ -8,7 +8,7 @@
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 
 ;; This file is not part of GNU Emacs.

swift-mode.el

@@ -8,7 +8,7 @@
 ;;       Arthur Evstifeev <lod@pisem.net>
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 ;; URL: https://github.com/swift-emacs/swift-mode
 

test/swift-mode-test-indent.el

@@ -5,7 +5,7 @@
 ;; Authors: taku0 (http://github.com/taku0)
 ;;
 ;; Version: 2.4.0
-;; Package-Requires: ((emacs "24.4"))
+;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 ;; URL: https://github.com/swift-emacs/swift-mode