[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ab82856 1/3: Merge from origin/emacs-28
|
From: |
Stefan Kangas |
|
Subject: |
master ab82856 1/3: Merge from origin/emacs-28 |
|
Date: |
Sat, 4 Dec 2021 00:47:27 -0500 (EST) |
branch: master
commit ab828569ab134bca88381dc2f51b40bfff444a5c
Merge: 284cc24 5d6f828
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
5d6f828799 Unbreak build after 9c222b9c1a7f91497a37567b4d7de3a511fff069.
---
src/pdumper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pdumper.c b/src/pdumper.c
index 02956aa..7ff079d 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2854,7 +2854,7 @@ dump_bool_vector (struct dump_context *ctx, const struct
Lisp_Vector *v)
static dump_off
dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr)
{
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_AA236F7759)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_F09D8E8E19)
# error "Lisp_Subr changed. See CHECK_STRUCTS comment in config.h."
#endif
struct Lisp_Subr out;