From 8ea87414b2fc3dc21ce5bfe458a49f2f1c13165d Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Sat, 22 Jun 2024 17:23:54 +0200
Subject: [PATCH 1/2] For DEFVAR_LISP_NOPRO, do the same as for DEFVAR_LISP

* src/lisp.h (DEFVAR_LISP_NOPRO): This shortcut doesn't work with MPS.
---
 src/lisp.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/lisp.h b/src/lisp.h
index 23e250ff0d1..c7e47edb0cf 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3588,12 +3588,21 @@ #define DEFVAR_LISP(lname, vname, doc)		\
       = {Lisp_Fwd_Obj, &globals.f_##vname};	\
     defvar_lisp (&o_fwd, lname);		\
   } while (false)
+#ifdef HAVE_MPS
 #define DEFVAR_LISP_NOPRO(lname, vname, doc)	\
   do {						\
     static struct Lisp_Objfwd const o_fwd	\
       = {Lisp_Fwd_Obj, &globals.f_##vname};	\
+    defvar_lisp (&o_fwd, lname);		\
+  } while (false)
+#else
+#define DEFVAR_LISP_NOPRO(lname, vname, doc)	\
+  do {						\
+  static struct Lisp_Objfwd const o_fwd		\
+    = {Lisp_Fwd_Obj, &globals.f_##vname};	\
     defvar_lisp_nopro (&o_fwd, lname);		\
   } while (false)
+#endif
 #define DEFVAR_BOOL(lname, vname, doc)		\
   do {						\
     static struct Lisp_Boolfwd const b_fwd	\
-- 
2.39.2