Skip to content

Commit 1565b0d

Browse files
authored
Merge pull request #767 from emacs-php/fix/flymake-proc-compilation
Fixed build failure in Emacs on master branch
2 parents b8c3484 + 886400c commit 1565b0d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
88

99
* Add `php-topsy-beginning-of-defun-with-class` to display classname with function signature. ([#766])
1010

11+
### Fixed
12+
13+
* Fixed build failure in Emacs on master branch ([#764], [#767])
14+
1115
### Removed
1216

1317
* Removed Phan-specific features from `php-project` ([#754])
1418

1519
[#754]: https://github.com/emacs-php/php-mode/pull/754
20+
[#764]: https://github.com/emacs-php/php-mode/issues/764
1621
[#766]: https://github.com/emacs-php/php-mode/pull/766
22+
[#767]: https://github.com/emacs-php/php-mode/pull/767
1723

1824
## [1.25.0] - 2023-07-24
1925

lisp/php-flymake.el

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626

2727
;;; Code:
2828
(require 'flymake)
29-
(require 'flymake-proc)
3029
(require 'cl-lib)
30+
(eval-and-compile
31+
(require 'flymake-proc))
3132
(eval-when-compile
3233
(require 'pcase)
3334
(require 'rx))

0 commit comments

Comments
 (0)