From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 23 Jun 2024 11:11:04 +0000 (-0400)
Subject: Update emacs-module for Emacs 31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dabb65220d0f5d48cd196c3576b634a09b7f38be;p=emacs.git

Update emacs-module for Emacs 31

* src/module-env-31.h: New file.
* src/module-env-30.h:
* configure.ac:
* src/emacs-module.h.in: Update emacs-module files for Emacs 31.

(cherry picked from commit 2d6ca28ce71ab81fb79d702f06b6ad47aa5de433)
---

diff --git a/configure.ac b/configure.ac
index 11067e02fbc..2162cf5f578 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5092,12 +5092,14 @@ AC_SUBST_FILE([module_env_snippet_27])
 AC_SUBST_FILE([module_env_snippet_28])
 AC_SUBST_FILE([module_env_snippet_29])
 AC_SUBST_FILE([module_env_snippet_30])
+AC_SUBST_FILE([module_env_snippet_31])
 module_env_snippet_25="$srcdir/src/module-env-25.h"
 module_env_snippet_26="$srcdir/src/module-env-26.h"
 module_env_snippet_27="$srcdir/src/module-env-27.h"
 module_env_snippet_28="$srcdir/src/module-env-28.h"
 module_env_snippet_29="$srcdir/src/module-env-29.h"
 module_env_snippet_30="$srcdir/src/module-env-30.h"
+module_env_snippet_31="$srcdir/src/module-env-31.h"
 emacs_major_version=`AS_ECHO([$PACKAGE_VERSION]) | sed 's/[[.]].*//'`
 AC_SUBST([emacs_major_version])
 
diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in
index 690254bd28c..21e4ca7cfa1 100644
--- a/src/emacs-module.h.in
+++ b/src/emacs-module.h.in
@@ -198,6 +198,23 @@ struct emacs_env_30
 @module_env_snippet_30@
 };
 
+struct emacs_env_31
+{
+@module_env_snippet_25@
+
+@module_env_snippet_26@
+
+@module_env_snippet_27@
+
+@module_env_snippet_28@
+
+@module_env_snippet_29@
+
+@module_env_snippet_30@
+
+@module_env_snippet_31@
+};
+
 /* Every module should define a function as follows.  */
 extern int emacs_module_init (struct emacs_runtime *runtime)
   EMACS_NOEXCEPT
diff --git a/src/module-env-30.h b/src/module-env-30.h
index e75210c7f8e..e69de29bb2d 100644
--- a/src/module-env-30.h
+++ b/src/module-env-30.h
@@ -1,3 +0,0 @@
-  /* Add module environment functions newly added in Emacs 30 here.
-     Before Emacs 30 is released, remove this comment and start
-     module-env-31.h on the master branch.  */
diff --git a/src/module-env-31.h b/src/module-env-31.h
new file mode 100644
index 00000000000..e9827b18382
--- /dev/null
+++ b/src/module-env-31.h
@@ -0,0 +1,3 @@
+  /* Add module environment functions newly added in Emacs 31 here.
+     Before Emacs 31 is released, remove this comment and start
+     module-env-32.h on the master branch.  */