branch: externals/compat
commit 66b832953545ceb5df4cdf54d79f63ba80f4193e
Author: Philip Kaludercic <phil...@posteo.net>
Commit: Philip Kaludercic <phil...@posteo.net>
Always load compat-macs
This is a temporary workaround that might help avoid issues like
https://todo.sr.ht/~pkal/compat/7 and perhaps
https://todo.sr.ht/~pkal/compat/5 too.
This will be reverted before the next release.
---
compat-24.el | 2 +-
compat-25.el | 2 +-
compat-26.el | 3 +--
compat-27.el | 2 +-
compat-28.el | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/compat-24.el b/compat-24.el
index 8e0fd93e92..d38f0511b4 100644
--- a/compat-24.el
+++ b/compat-24.el
@@ -37,7 +37,7 @@
;;; Code:
-(eval-when-compile (require 'compat-macs))
+(require 'compat-macs "compat-macs.el")
(compat-declare-version "24.4")
diff --git a/compat-25.el b/compat-25.el
index 60f365ba68..471fbee8b2 100644
--- a/compat-25.el
+++ b/compat-25.el
@@ -32,7 +32,7 @@
;;; Code:
-(eval-when-compile (require 'compat-macs))
+(require 'compat-macs "compat-macs.el")
(compat-declare-version "25.1")
diff --git a/compat-26.el b/compat-26.el
index f712d24e76..98f7b2fb43 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -37,8 +37,7 @@
;;; Code:
-(eval-when-compile (require 'compat-macs))
-(declare-function compat-func-arity "compat" (func))
+(require 'compat-macs "compat-macs.el")
(compat-declare-version "26.1")
diff --git a/compat-27.el b/compat-27.el
index bc0e37a356..a96b1e9663 100644
--- a/compat-27.el
+++ b/compat-27.el
@@ -39,7 +39,7 @@
;;; Code:
-(eval-when-compile (require 'compat-macs))
+(require 'compat-macs "compat-macs.el")
(compat-declare-version "27.1")
diff --git a/compat-28.el b/compat-28.el
index 1cb3879acb..a3dc769341 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -39,7 +39,7 @@
;;; Code:
-(eval-when-compile (require 'compat-macs))
+(require 'compat-macs "compat-macs.el")
(compat-declare-version "28.1")
