Skip to content

Commit

Permalink
Merge pull request #767 from emacs-php/fix/flymake-proc-compilation
Browse files Browse the repository at this point in the history
Fixed build failure in Emacs on master branch
  • Loading branch information
zonuexe authored Nov 18, 2023
2 parents b8c3484 + 886400c commit 1565b0d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this

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

### Fixed

* Fixed build failure in Emacs on master branch ([#764], [#767])

### Removed

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

[#754]: https://github.com/emacs-php/php-mode/pull/754
[#764]: https://github.com/emacs-php/php-mode/issues/764
[#766]: https://github.com/emacs-php/php-mode/pull/766
[#767]: https://github.com/emacs-php/php-mode/pull/767

## [1.25.0] - 2023-07-24

Expand Down
3 changes: 2 additions & 1 deletion lisp/php-flymake.el
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@

;;; Code:
(require 'flymake)
(require 'flymake-proc)
(require 'cl-lib)
(eval-and-compile
(require 'flymake-proc))
(eval-when-compile
(require 'pcase)
(require 'rx))
Expand Down

0 comments on commit 1565b0d

Please sign in to comment.