branch: externals/compat
commit a4db1521d04a578f41db32c59cd2c928df664113
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Move compat-funcall and compat-function
---
compat-24.el | 15 ---------------
compat.el | 15 +++++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/compat-24.el b/compat-24.el
index cf81c1c068..b47efe4996 100644
--- a/compat-24.el
+++ b/compat-24.el
@@ -22,21 +22,6 @@
;;; Code:
-(defmacro compat-function (fun)
- "Return compatibility function symbol for FUN.
-
-If the Emacs version provides a sufficiently recent version of
-FUN, the symbol FUN is returned itself."
- (let ((compat (intern (format "compat--explicit-%s" fun))))
- `#',(if (fboundp compat) compat fun)))
-
-(defmacro compat-funcall (fun &rest args)
- "Call compatibility function FUN with ARGS.
-
-See `compat-function' for the compatibility function resolution."
- (let ((compat (intern (format "compat--explicit-%s" fun))))
- `(,(if (fboundp compat) compat fun) ,@args)))
-
(eval-when-compile (load "compat-macs.el" nil t t))
(compat-declare-version "24.4")
diff --git a/compat.el b/compat.el
index 197c2f24b4..6741dbb56e 100644
--- a/compat.el
+++ b/compat.el
@@ -42,5 +42,20 @@
(require 'compat-29)
+(defmacro compat-function (fun)
+ "Return compatibility function symbol for FUN.
+
+If the Emacs version provides a sufficiently recent version of
+FUN, the symbol FUN is returned itself."
+ (let ((compat (intern (format "compat--explicit-%s" fun))))
+ `#',(if (fboundp compat) compat fun)))
+
+(defmacro compat-funcall (fun &rest args)
+ "Call compatibility function FUN with ARGS.
+
+See `compat-function' for the compatibility function resolution."
+ (let ((compat (intern (format "compat--explicit-%s" fun))))
+ `(,(if (fboundp compat) compat fun) ,@args)))
+
(provide 'compat)
;;; compat.el ends here
