branch: externals/compat
commit 1b5e81c350618710b3f5b62eec8d53ff363847f8
Author: Philip Kaludercic <phil...@posteo.net>
Commit: Philip Kaludercic <phil...@posteo.net>
Prepare support for Emacs 30
---
Makefile | 1 +
compat-30.el | 30 ++++++++++++++++++++++++++++++
compat.el | 7 +++----
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 64bfd6443e..b6ccb29357 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ BYTEC = compat-25.elc \
compat-27.elc \
compat-28.elc \
compat-29.elc \
+ compat-30.elc \
compat.elc \
compat-macs.elc \
compat-tests.elc
diff --git a/compat-30.el b/compat-30.el
new file mode 100644
index 0000000000..3967c40245
--- /dev/null
+++ b/compat-30.el
@@ -0,0 +1,30 @@
+;;; compat-30.el --- Functionality added in Emacs 30 -*- lexical-binding: t;
-*-
+
+;; Copyright (C) 2023 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functionality added in Emacs 30, needed by older Emacs versions.
+
+;;; Code:
+
+(eval-when-compile (load "compat-macs.el" nil t t))
+(compat-require compat-29 "29.1")
+
+
+
+(provide 'compat-30)
+;;; compat-30.el ends here
diff --git a/compat.el b/compat.el
index 646ad994e2..a34a4556f2 100644
--- a/compat.el
+++ b/compat.el
@@ -49,12 +49,11 @@
;; Ensure that the newest compatibility layer is required at compile
;; time and runtime, but only if needed.
(eval-when-compile
- (defmacro compat--maybe-require-29 ()
- ;; TODO Update to 29.1 as soon as the Emacs emacs-29 branch version bumped
- (when (version< emacs-version "29.0.90")
+ (defmacro compat--maybe-require-30 ()
+ (when (version< emacs-version "30.0.50")
(require 'compat-29)
'(require 'compat-29))))
-(compat--maybe-require-29)
+(compat--maybe-require-30)
;;;; Macros for extended compatibility function calls
