Always load prefixed definitions

We will move away from prefixed definitions later on and introduce
`compat-function' and `compat-funcall' macros. These macros make it possible to
call compatibility functions with different calling conventions. The prefixed
definitions will be deprecated. The problem with the prefixed definitions is two-fold:

1. They pollute the namespace and the API surface of Compat will become larger
and larger with every version.

2. Since Compat is not part of Emacs itself, the prefixed definitions cannot be
used by :core packages. By adding the `compat-funcall' and `compat-function'
macro to the core itself, which is a minimal addition, using compatibility
function with modified calling convention becomes possible.

1 files changed, 6 insertions, 11 deletions

diff --git a/compat.el b/compat.el
index cfe3bf7..7c400ce 100644
--- a/compat.el
+++ b/compat.el
@@ -40,17 +40,12 @@
 
 ;;; Code:
 
-(defvar compat--inhibit-prefixed)
-(let ((compat--inhibit-prefixed (not (bound-and-true-p compat-testing))))
-  ;; Instead of using `require', we manually check `features' and call
-  ;; `load' to avoid the issue of not using `provide' at the end of
-  ;; the file (which is disabled by `compat--inhibit-prefixed', so
-  ;; that the file can be loaded again at some later point when the
-  ;; prefixed definitions are needed).
-  (dolist (version '(24 25 26 27 28 29))
-    (let ((feature-name (format "compat-%d" version)))
-      (unless (memq (intern feature-name) features)
-        (load feature-name nil t)))))
+(require 'compat-24)
+(require 'compat-25)
+(require 'compat-26)
+(require 'compat-27)
+(require 'compat-28)
+(require 'compat-29)
 
 (provide 'compat)
 ;;; compat.el ends here