Skip to content

Commit 9cfa483

Browse files
authored
Merge pull request #497 from emacs-php/fix/error-on-emacs27
Remove matcher that added in Emacs 27
2 parents 27f280f + c3a6c6b commit 9cfa483

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
- EMACS_VERSION=emacs-25.3-travis
88
- EMACS_VERSION=emacs-26.1-travis
99
- EMACS_VERSION=emacs-git-snapshot-travis
10+
- EMACS_VERSION=remacs-git-snapshot-travis
1011
# matrix:
1112
# allow_failures:
1213
# - env: EMACS_VERSION=emacs-git-snapshot-travis

php-mode.el

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
(defconst php-mode-version-number "1.21.0"
1717
"PHP Mode version number.")
1818

19-
(defconst php-mode-modified "2019-01-09"
19+
(defconst php-mode-modified "2019-02-28"
2020
"PHP Mode build date.")
2121

2222
;; This file is free software; you can redistribute it and/or
@@ -675,6 +675,10 @@ might be to handle switch and goto labels differently."
675675
(c-lang-const c-constant-kwds))
676676
:test 'string-equal))))
677677

678+
(c-lang-defconst c-basic-matchers-before
679+
php (cl-remove-if (lambda (elm) (and (listp elm) (equal (car elm) "\\s|")))
680+
(c-lang-const c-basic-matchers-before php)))
681+
678682
(defun php-lineup-cascaded-calls (langelem)
679683
"Line up chained methods using `c-lineup-cascaded-calls',
680684
but only if the setting is enabled"

0 commit comments

Comments
 (0)