branch: externals/compat
commit 6b32c2058bfefccb65394a6c891f6f4837505cba
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Rename compat-current-version to compat--current-version
---
compat-macs.el | 6 +++---
compat-tests.el | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/compat-macs.el b/compat-macs.el
index e0220dde70..ff15120adc 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -29,14 +29,14 @@
"Ignore all arguments."
nil)
-(defvar compat-current-version nil
+(defvar compat--current-version nil
"Default version to use when no explicit version was given.")
(defmacro compat-declare-version (version)
"Set the Emacs version that is currently being handled to VERSION."
;; FIXME: Avoid setting the version for any definition that might
;; follow, but try to restrict it to the current file/buffer.
- (setq compat-current-version version)
+ (setq compat--current-version version)
nil)
(defvar compat--generate-function #'compat--generate-default
@@ -93,7 +93,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
(feature (plist-get attr :feature))
(cond (plist-get attr :cond))
(version (or (plist-get attr :version)
- compat-current-version))
+ compat--current-version))
(realname (or (plist-get attr :realname)
(intern (format "compat--%S" name))))
(check (cond
diff --git a/compat-tests.el b/compat-tests.el
index 3594cf8f84..570adb260e 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -36,7 +36,6 @@
(require 'compat-macs)
-(defvar compat-current-version)
(defun compat--generate-testable (name def-fn install-fn check-fn attr type)
"Generate a more verbose compatibility definition, fit for testing.
See `compat-generate-function' for details on the arguments NAME,
@@ -46,7 +45,7 @@ DEF-FN, INSTALL-FN, CHECK-FN, ATTR and TYPE."
(feature (plist-get attr :feature))
(cond (plist-get attr :cond))
(version (or (plist-get attr :version)
- compat-current-version))
+ compat--current-version))
(realname (or (plist-get attr :realname)
(intern (format "compat--%S" name))))
(body `(progn
