branch: externals/compat
commit 3dba9cd612f9419c876b6f1c2ef36e2b2c77bc8b
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Revert "Declare version only at compile time"
This reverts commit 9842d683d8dc3ae31ab530d6f4e42dabe47fb25a.
---
compat-24.el | 6 +++---
compat-25.el | 6 +++---
compat-26.el | 6 +++---
compat-27.el | 6 +++---
compat-28.el | 6 +++---
compat-29.el | 20 ++++++++++----------
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/compat-24.el b/compat-24.el
index 9cb61a7b7d..e6ca7928f2 100644
--- a/compat-24.el
+++ b/compat-24.el
@@ -37,9 +37,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "24.4"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "24.4")
;;;; Defined in data.c
diff --git a/compat-25.el b/compat-25.el
index f0705dc274..84ef300d37 100644
--- a/compat-25.el
+++ b/compat-25.el
@@ -32,9 +32,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "25.1"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "25.1")
;;;; Defined in alloc.c
diff --git a/compat-26.el b/compat-26.el
index 8fb482cb18..eb3bd5eb4e 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -37,9 +37,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "26.1"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "26.1")
;;;; Defined in eval.c
diff --git a/compat-27.el b/compat-27.el
index 4590bc6f3f..0997597ee7 100644
--- a/compat-27.el
+++ b/compat-27.el
@@ -39,9 +39,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "27.1"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "27.1")
;;;; Defined in fns.c
diff --git a/compat-28.el b/compat-28.el
index 8a7f5cc931..6213d7b214 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -39,9 +39,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "28.1"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "28.1")
;;;; Defined in fns.c
diff --git a/compat-29.el b/compat-29.el
index 64cdcb37ad..20076ff5b6 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -33,9 +33,9 @@
;;; Code:
-(eval-when-compile
- (load "compat-macs.el" nil t t)
- (compat-declare-version "29.1"))
+(eval-when-compile (load "compat-macs.el" nil t t))
+
+(compat-declare-version "29.1")
;;;; Defined in xdisp.c
@@ -541,11 +541,11 @@ the symbol of the calling function, for example."
(let* ((file (directory-file-name (expand-file-name file)))
(remote-file-name-inhibit-cache t)
(fileattr (file-attributes file 'integer))
- (attr (and fileattr
+ (attr (and fileattr
(cons (nth 7 fileattr)
- (nth 5 fileattr))))
- (sym (concat (symbol-name tag) "@" file))
- (cachedattr (gethash sym compat--file-has-changed-p--hash-table)))
+ (nth 5 fileattr))))
+ (sym (concat (symbol-name tag) "@" file))
+ (cachedattr (gethash sym compat--file-has-changed-p--hash-table)))
(when (not (equal attr cachedattr))
(puthash sym attr compat--file-has-changed-p--hash-table))))
@@ -827,9 +827,9 @@ in a cleaner way with command remapping, like this:
(unless prefix
(setq prefix ""))
(let* ((scan (or oldmap keymap))
- (prefix1 (vconcat prefix [nil]))
- (key-substitution-in-progress
- (cons scan key-substitution-in-progress)))
+ (prefix1 (vconcat prefix [nil]))
+ (key-substitution-in-progress
+ (cons scan key-substitution-in-progress)))
;; Scan OLDMAP, finding each char or event-symbol that
;; has any definition, and act on it with hack-key.
(map-keymap
