branch: elpa/swift-mode
commit 59dcd603848656c691f76cc5095ea354c307dbcf
Author: taku0 <mxxouy6x3m_git...@tatapa.org>
Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Fix errors in 24.4
---
.travis.yml | 7 +++----
Makefile | 10 ++++------
swift-mode-beginning-of-defun.el | 2 +-
swift-mode-font-lock.el | 3 ++-
swift-mode-indent.el | 2 +-
swift-mode-lexer.el | 7 +++++--
swift-mode-repl.el | 2 +-
swift-mode.el | 2 +-
test/swift-mode-test-indent.el | 2 +-
9 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a84c4dd..4aa0638 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
index 973d580..303f864 100644
--- a/Makefile
+++ b/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 .)"\")" \
diff --git a/swift-mode-beginning-of-defun.el b/swift-mode-beginning-of-defun.el
index 7c1b819..570d035 100644
--- a/swift-mode-beginning-of-defun.el
+++ b/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.
diff --git a/swift-mode-font-lock.el b/swift-mode-font-lock.el
index 337407e..f31712d 100644
--- a/swift-mode-font-lock.el
+++ b/swift-mode-font-lock.el
@@ -8,7 +8,7 @@
;; Arthur Evstifeev <l...@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))
diff --git a/swift-mode-indent.el b/swift-mode-indent.el
index a9f0195..1d07415 100644
--- a/swift-mode-indent.el
+++ b/swift-mode-indent.el
@@ -8,7 +8,7 @@
;; Arthur Evstifeev <l...@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.
diff --git a/swift-mode-lexer.el b/swift-mode-lexer.el
index 3b0f90f..eaeb709 100644
--- a/swift-mode-lexer.el
+++ b/swift-mode-lexer.el
@@ -8,7 +8,7 @@
;; Arthur Evstifeev <l...@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))))
diff --git a/swift-mode-repl.el b/swift-mode-repl.el
index 3f73c2c..7159db9 100644
--- a/swift-mode-repl.el
+++ b/swift-mode-repl.el
@@ -8,7 +8,7 @@
;; Arthur Evstifeev <l...@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.
diff --git a/swift-mode.el b/swift-mode.el
index a3ee642..224e3d4 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -8,7 +8,7 @@
;; Arthur Evstifeev <l...@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
diff --git a/test/swift-mode-test-indent.el b/test/swift-mode-test-indent.el
index 7e1dbc1..de3eaee 100644
--- a/test/swift-mode-test-indent.el
+++ b/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
