branch: externals/compat commit cadcc744d0db95d86deb8c2c55b5a5e3a05cadd0 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Move functions from compat--explicit- to compat-- --- compat-macs.el | 6 +++--- compat.el | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compat-macs.el b/compat-macs.el index c088f6bb49..7581c7d3b8 100644 --- a/compat-macs.el +++ b/compat-macs.el @@ -152,7 +152,7 @@ attributes (see `compat--generate-function')." ((eq type 'macro) 'defmacro) ((error "Unknown type"))) ,(if (plist-get rest :explicit) - (intern (format "compat--explicit-%s" oldname)) + (intern (format "compat--%s" oldname)) realname) ,arglist ;; Prepend compatibility notice to the actual @@ -178,12 +178,12 @@ If this is not documented on yourself system, you can check \ ,@body) ,@(and (plist-get rest :explicit) (if (string= realname name) - `((defalias ',name ',(intern (format "compat--explicit-%s" oldname))) + `((defalias ',name ',(intern (format "compat--%s" oldname))) (make-obsolete ',name "Use `compat-funcall' or `compat-function' instead" "29.1")) - `((defalias ',realname #',(intern (format "compat--explicit-%s" oldname)))))))) + `((defalias ',realname #',(intern (format "compat--%s" oldname)))))))) (lambda (realname _version) ;; Functions and macros are installed by aliasing the name of the ;; compatible function to the name of the compatibility function. diff --git a/compat.el b/compat.el index 0370fa1c8b..28ddf61b32 100644 --- a/compat.el +++ b/compat.el @@ -47,14 +47,14 @@ 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)))) + (let ((compat (intern (format "compat--%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)))) + (let ((compat (intern (format "compat--%s" fun)))) `(,(if (fboundp compat) compat fun) ,@args))) (provide 'compat)