Merge pull request #453 from zonuexe/php-mode-indentation-error

Add c-lang-defconst c-anchored-cpp-prefix
emacs-php · Apr 7, 2018 · 0b1553b · 0b1553b
2 parents 05d7474 + d532062
commit 0b1553b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,9 @@ env:
     - EMACS_VERSION=emacs-25.2-travis
     - EMACS_VERSION=emacs-25.3-travis
     - EMACS_VERSION=emacs-git-snapshot-travis
-matrix:
-  allow_failures:
-  - env: EMACS_VERSION=emacs-git-snapshot-travis
+# matrix:
+#   allow_failures:
+#   - env: EMACS_VERSION=emacs-git-snapshot-travis
 
 before_install:
   - export PATH="/home/travis/.evm/bin:$PATH"

diff --git a/php-mode.el b/php-mode.el
@@ -486,6 +486,9 @@ In that case set to `NIL'."
 (c-lang-defconst c-opt-cpp-prefix
   php "\\s-*<\\?")
 
+(c-lang-defconst c-anchored-cpp-prefix
+  php "\\s-*\\(<\\?(=\\|\\sw+)\\)")
+
 (c-lang-defconst c-identifier-ops
   php '(
         (left-assoc "\\" "::" "->")