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 11067e02fbc3fe859be1cdf9eef18c5294aa47ee..2162cf5f5782872a2d0f20e11ef51d45669eb497 100644 (file)
--- 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 690254bd28c9440260e35171095cbf7801be8fa2..21e4ca7cfa1ba23f3fcf1c4868a265bf57ab5229 100644 (file)
--- 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 e75210c7f8e136885a65ace1ef023111ba7febf2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 (file)
index 0000000..e9827b1
--- /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.  */