From 578eeb8b1037d6572cced64e9f5fb238a017ece2 Mon Sep 17 00:00:00 2001 From: Phil Sainty Date: Thu, 9 Jan 2025 21:21:55 +1300 Subject: [PATCH] ; * lisp/so-long.el: Backwards-compatibility fix for Emacs < 27 We support Emacs 24.4 and later (for ELPA releases), and ad-find-advice only changed from a macro to a function in Emacs 27, so this change is to restore compatibility with older versions where we do need the macro definition loaded at byte-compilation time. This effectively combines the related changes from: - commit 986c12b20fa29c37f13563846fddf6edcd0b4945 - commit c221db0402031c23b983eea3a6bc129e5abb98f6 (cherry picked from commit 03a6d5a76331e814368f17a61718208242e44bee) --- lisp/so-long.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/so-long.el b/lisp/so-long.el index 1291ba0baba..8ac4ff87a94 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el @@ -1994,7 +1994,10 @@ If it appears in `%s', you should remove it." ;; Update to version 1.0 from earlier versions: (when (version< so-long-version "1.0") (remove-hook 'change-major-mode-hook 'so-long-change-major-mode) - (require 'advice) ;; It should already be loaded, but just in case. + (require 'advice) + ;; `ad-find-advice' is a macro in Emacs 26 and earlier. + (eval-when-compile (when (< emacs-major-version 27) + (require 'advice))) (declare-function ad-find-advice "advice") (declare-function ad-remove-advice "advice") (declare-function ad-activate "advice") -- 2.39.5