Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling.

[Basil L. Contovounesios]

Gregory Heytings [2022-07-16 15:14 -0400] wrote:

> branch: feature/fix-the-long-lines-display-bug
> commit e7b5912b235936b304701ba6b1e808d9b197fd4f
> Author: Gregory Heytings <gregory@heytings.org>
> Commit: Gregory Heytings <gregory@heytings.org>
>
>     Improvements to long lines handling.
>     
>     * src/buffer.h (struct buffer): New field 'long_line_optimizations_p'.
[...]

This seems to have given rise to the following build error with
--enable-checking=structs:

pdumper.c: In function ‘dump_buffer’:
pdumper.c:2705:3: error: #error "buffer changed. See CHECK_STRUCTS comment in 
config.h."
 2705 | # error "buffer changed. See CHECK_STRUCTS comment in config.h."
      |   ^~~~~

Is this the right fix?

>From ea925aac28cf96fe1ad5736850386e24cc259a7c Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Sat, 23 Jul 2022 14:22:09 +0300
Subject: [PATCH] Update pdumper.c after recent long lines changes

* src/pdumper.c (dump_buffer): Dump new field
long_line_optimizations_p introduced in commit e7b5912b23 of
2022-07-16 "Improvements to long lines handling."
(dump_buffer) [CHECK_STRUCTS]: Update hash accordingly
for --enable-checking=structs.
---
 src/pdumper.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pdumper.c b/src/pdumper.c
index af451920eb..33cb804dba 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2701,7 +2701,7 @@ dump_hash_table (struct dump_context *ctx,
 static dump_off
 dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer)
 {
-#if CHECK_STRUCTS && !defined HASH_buffer_F8FE65D42F
+#if CHECK_STRUCTS && !defined HASH_buffer_AA373AEE10
 # error "buffer changed. See CHECK_STRUCTS comment in config.h."
 #endif
   struct buffer munged_buffer = *in_buffer;
@@ -2813,6 +2813,7 @@ dump_buffer (struct dump_context *ctx, const struct 
buffer *in_buffer)
   DUMP_FIELD_COPY (out, buffer, prevent_redisplay_optimizations_p);
   DUMP_FIELD_COPY (out, buffer, clip_changed);
   DUMP_FIELD_COPY (out, buffer, inhibit_buffer_hooks);
+  DUMP_FIELD_COPY (out, buffer, long_line_optimizations_p);
 
   dump_field_lv_rawptr (ctx, out, buffer, &buffer->overlays_before,
                         Lisp_Vectorlike, WEIGHT_NORMAL);
-- 
2.35.1

Thanks,

-- 
Basil