branch: elpa/php-mode
commit a8a62f39ed7af1d411bc56f58ebb1c26b9cbd8c0
Author: USAMI Kenta <tad...@zonu.me>
Commit: USAMI Kenta <tad...@zonu.me>
Make append to flymake-allowed-file-name-masks only in legacy
---
CHANGELOG.md | 1 +
lisp/php-mode.el | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53d308ec65..c4ba92416d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ All notable changes of the PHP Mode 1.19.1 release series are
documented in this
* Make `php-mode-version` function include a Git tag and revision ([#713])
* Like `"1.23.4-56-xxxxxx"` for example.
* Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid
confusion ([#717])
+ * Make `php-flymake-php-init` append to `flymake-allowed-file-name-masks`
only in legacy Flymake ([#718])
### Deprecated
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index b4088d2f89..d7603131dd 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1542,12 +1542,10 @@ for \\[find-tag] (which see)."
(defvar php-font-lock-keywords php-font-lock-keywords-3
"Default expressions to highlight in PHP Mode.")
-(add-to-list
- (eval-when-compile
- (if (boundp 'flymake-proc-allowed-file-name-masks)
- 'flymake-proc-allowed-file-name-masks
- 'flymake-allowed-file-name-masks))
- '("\\.php[345s]?\\'" php-flymake-php-init))
+(eval-when-compile
+ (unless (boundp 'flymake-proc-allowed-file-name-masks)
+ (add-to-list 'flymake-allowed-file-name-masks
+ '("\\.php[345s]?\\'" php-flymake-php-init))))
(defun php-send-region (start end)
