From 986c12b20fa29c37f13563846fddf6edcd0b4945 Mon Sep 17 00:00:00 2001 From: Phil Sainty Date: Sat, 4 Jul 2020 01:43:08 +1200 Subject: [PATCH] ; * lisp/so-long.el: Byte-compilation bug fix As this `require' is not at the top-level (it is only conditionally evaluated, when loading the library over the top of an earlier version), we need `eval-and-compile' to ensure that both macros and functions from advice.el are accounted for. --- lisp/so-long.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/so-long.el b/lisp/so-long.el index b3596bdab7b..21dc7de75c8 100644 --- a/lisp/so-long.el +++ b/lisp/so-long.el @@ -1819,9 +1819,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) + (eval-and-compile (require 'advice)) ;; Both macros and functions. (declare-function ad-find-advice "advice") (declare-function ad-remove-advice "advice") + (declare-function ad-activate "advice") (when (ad-find-advice 'hack-local-variables 'after 'so-long--file-local-mode) (ad-remove-advice 'hack-local-variables 'after 'so-long--file-local-mode) (ad-activate 'hack-local-variables)) -- 2.39.2