emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/php-mode 1565b0db7d 5/5: Merge pull request #767 from emac


From: ELPA Syncer
Subject: [nongnu] elpa/php-mode 1565b0db7d 5/5: Merge pull request #767 from emacs-php/fix/flymake-proc-compilation
Date: Sat, 18 Nov 2023 01:00:12 -0500 (EST)

branch: elpa/php-mode
commit 1565b0db7d547d4e339ce7aaf27653eafc705090
Merge: b8c3484015 886400c8ee
Author: USAMI Kenta <tadsan@pixiv.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #767 from emacs-php/fix/flymake-proc-compilation
    
    Fixed build failure in Emacs on master branch
---
 CHANGELOG.md        | 6 ++++++
 lisp/php-flymake.el | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c29853eb2..b96f30ec8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/lisp/php-flymake.el b/lisp/php-flymake.el
index a3650dad09..a55a22a8d3 100644
--- a/lisp/php-flymake.el
+++ b/lisp/php-flymake.el
@@ -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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]