From: Phil Sainty <psainty@orcon.net.nz>
Date: Fri, 3 Jul 2020 13:43:08 +0000 (+1200)
Subject: ; * lisp/so-long.el: Byte-compilation bug fix
X-Git-Tag: emacs-27.1~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=986c12b20fa29c37f13563846fddf6edcd0b4945;p=emacs.git

; * 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.
---

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))