Skip to content

Commit a8a62f3

Browse files
committed
Make append to flymake-allowed-file-name-masks only in legacy
1 parent 330070d commit a8a62f3

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
2727
* Make `php-mode-version` function include a Git tag and revision ([#713])
2828
* Like `"1.23.4-56-xxxxxx"` for example.
2929
* Change `php-phpdoc-type-keywords` to `php-phpdoc-type-names` to avoid confusion ([#717])
30+
* Make `php-flymake-php-init` append to `flymake-allowed-file-name-masks` only in legacy Flymake ([#718])
3031

3132
### Deprecated
3233

lisp/php-mode.el

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,12 +1542,10 @@ for \\[find-tag] (which see)."
15421542
(defvar php-font-lock-keywords php-font-lock-keywords-3
15431543
"Default expressions to highlight in PHP Mode.")
15441544

1545-
(add-to-list
1546-
(eval-when-compile
1547-
(if (boundp 'flymake-proc-allowed-file-name-masks)
1548-
'flymake-proc-allowed-file-name-masks
1549-
'flymake-allowed-file-name-masks))
1550-
'("\\.php[345s]?\\'" php-flymake-php-init))
1545+
(eval-when-compile
1546+
(unless (boundp 'flymake-proc-allowed-file-name-masks)
1547+
(add-to-list 'flymake-allowed-file-name-masks
1548+
'("\\.php[345s]?\\'" php-flymake-php-init))))
15511549

15521550

15531551
(defun php-send-region (start end)

0 commit comments

Comments
 (0)