branch: elpa/php-mode
commit 330070dc01a8afacd78f6f108951bc4707a9730c
Author: USAMI Kenta <tad...@zonu.me>
Commit: USAMI Kenta <tad...@zonu.me>
Fix php-flymake-php-init for legacy flymake
---
lisp/php.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lisp/php.el b/lisp/php.el
index 3a79a97ac3..ce70b279fb 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -550,11 +550,9 @@ The order is reversed by calling as follows:
This is an alternative function of `flymake-php-init'.
Look at the `php-executable' variable instead of the constant \"php\" command."
- (let* ((init (funcall (eval-when-compile
- (if (fboundp 'flymake-proc-php-init)
- 'flymake-proc-php-init
- 'flymake-php-init)))))
- (list php-executable (cdr init))))
+ (let ((init (with-no-warnings (flymake-php-init))))
+ (setf (car init) php-executable)
+ init))
(defconst php-re-detect-html-tag-aggressive
(eval-when-compile
