* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. [not found] ` <20220716191457.3B0FAC00095@vcs2.savannah.gnu.org> @ 2022-07-23 11:40 ` Basil L. Contovounesios 2022-07-23 13:20 ` Eli Zaretskii 0 siblings, 1 reply; 9+ messages in thread From: Basil L. Contovounesios @ 2022-07-23 11:40 UTC (permalink / raw To: emacs-devel; +Cc: Gregory Heytings [-- Attachment #1: Type: text/plain, Size: 744 bytes --] 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? [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-Update-pdumper.c-after-recent-long-lines-changes.patch --] [-- Type: text/x-diff, Size: 1516 bytes --] 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 [-- Attachment #3: Type: text/plain, Size: 20 bytes --] Thanks, -- Basil ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-23 11:40 ` feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling Basil L. Contovounesios @ 2022-07-23 13:20 ` Eli Zaretskii 2022-07-23 13:51 ` Basil L. Contovounesios 2022-07-25 20:50 ` Gregory Heytings 0 siblings, 2 replies; 9+ messages in thread From: Eli Zaretskii @ 2022-07-23 13:20 UTC (permalink / raw To: Basil L. Contovounesios; +Cc: emacs-devel, gregory > From: "Basil L. Contovounesios" <contovob@tcd.ie> > Cc: Gregory Heytings <gregory@heytings.org> > Date: Sat, 23 Jul 2022 14:40:53 +0300 > > 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? Yes, thanks. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-23 13:20 ` Eli Zaretskii @ 2022-07-23 13:51 ` Basil L. Contovounesios 2022-07-24 11:14 ` Robert Pluim 2022-07-25 20:50 ` Gregory Heytings 1 sibling, 1 reply; 9+ messages in thread From: Basil L. Contovounesios @ 2022-07-23 13:51 UTC (permalink / raw To: Eli Zaretskii; +Cc: emacs-devel, gregory Eli Zaretskii [2022-07-23 16:20 +0300] wrote: >> From: "Basil L. Contovounesios" <contovob@tcd.ie> >> Cc: Gregory Heytings <gregory@heytings.org> >> Date: Sat, 23 Jul 2022 14:40:53 +0300 >> >> 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? > > Yes, thanks. Thanks, pushed. Update pdumper.c after recent long lines changes 26f4bcc6d7 2022-07-23 16:33:09 +0300 https://git.sv.gnu.org/cgit/emacs.git/commit/?id=26f4bcc6d7 -- Basil ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-23 13:51 ` Basil L. Contovounesios @ 2022-07-24 11:14 ` Robert Pluim 2022-07-24 11:45 ` Eli Zaretskii 0 siblings, 1 reply; 9+ messages in thread From: Robert Pluim @ 2022-07-24 11:14 UTC (permalink / raw To: Basil L. Contovounesios; +Cc: Eli Zaretskii, emacs-devel, gregory >>>>> On Sat, 23 Jul 2022 16:51:25 +0300, "Basil L. Contovounesios" <contovob@tcd.ie> said: Basil> Eli Zaretskii [2022-07-23 16:20 +0300] wrote: >>> From: "Basil L. Contovounesios" <contovob@tcd.ie> >>> Cc: Gregory Heytings <gregory@heytings.org> >>> Date: Sat, 23 Jul 2022 14:40:53 +0300 >>> >>> 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? >> >> Yes, thanks. Basil> Thanks, pushed. Apropos, is there an ʼupdating pdumper stuff for dummiesʼ guide somewhere? Something along the lines of: - if you add an int to struct <foo>, do <bar> - if you add a Lisp_Object to struct <baz>, do <frot> I ask, because Iʼm playing with struct buffer_text, and Iʼm very successfully causing 'failure to dump' :-) Robert -- ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-24 11:14 ` Robert Pluim @ 2022-07-24 11:45 ` Eli Zaretskii 2022-07-24 12:10 ` Robert Pluim 0 siblings, 1 reply; 9+ messages in thread From: Eli Zaretskii @ 2022-07-24 11:45 UTC (permalink / raw To: Robert Pluim; +Cc: contovob, emacs-devel, gregory > From: Robert Pluim <rpluim@gmail.com> > Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org, gregory@heytings.org > Gmane-Reply-To-List: yes > Date: Sun, 24 Jul 2022 13:14:21 +0200 > > Apropos, is there an ʼupdating pdumper stuff for dummiesʼ guide > somewhere? Something along the lines of: > - if you add an int to struct <foo>, do <bar> > - if you add a Lisp_Object to struct <baz>, do <frot> > > I ask, because Iʼm playing with struct buffer_text, and Iʼm very > successfully causing 'failure to dump' :-) The error message points you to the comment in config.h that is supposed to be the "updating pdumper stuff for dummies" guide: error: #error "buffer changed. See CHECK_STRUCTS comment in config.h." ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-24 11:45 ` Eli Zaretskii @ 2022-07-24 12:10 ` Robert Pluim 0 siblings, 0 replies; 9+ messages in thread From: Robert Pluim @ 2022-07-24 12:10 UTC (permalink / raw To: Eli Zaretskii; +Cc: contovob, emacs-devel, gregory >>>>> On Sun, 24 Jul 2022 14:45:09 +0300, Eli Zaretskii <eliz@gnu.org> said: >> From: Robert Pluim <rpluim@gmail.com> >> Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org, gregory@heytings.org >> Gmane-Reply-To-List: yes >> Date: Sun, 24 Jul 2022 13:14:21 +0200 >> >> Apropos, is there an ʼupdating pdumper stuff for dummiesʼ guide >> somewhere? Something along the lines of: >> - if you add an int to struct <foo>, do <bar> >> - if you add a Lisp_Object to struct <baz>, do <frot> >> >> I ask, because Iʼm playing with struct buffer_text, and Iʼm very >> successfully causing 'failure to dump' :-) Eli> The error message points you to the comment in config.h that is Eli> supposed to be the "updating pdumper stuff for dummies" guide: Eli> error: #error "buffer changed. See CHECK_STRUCTS comment in config.h." Sorry, I wasnʼt clear. That just fixes the compile error, it doesnʼt cover the second part, which is to ensure that your new field is dumped/restored correctly. For a struct Lisp_Hash_Table *, DUMP_FIELD_COPY is not enough. Robert -- ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-23 13:20 ` Eli Zaretskii 2022-07-23 13:51 ` Basil L. Contovounesios @ 2022-07-25 20:50 ` Gregory Heytings 2022-07-26 11:07 ` Eli Zaretskii 1 sibling, 1 reply; 9+ messages in thread From: Gregory Heytings @ 2022-07-25 20:50 UTC (permalink / raw To: Eli Zaretskii; +Cc: Basil L. Contovounesios, emacs-devel [-- Attachment #1: Type: text/plain, Size: 566 bytes --] >> 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? > > Yes, thanks. > Thanks. But how comes this warning did not show up in my --enable-checking=all build? Is "all" not really "all"? If not, what's the appropriate value for "really all"? ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-25 20:50 ` Gregory Heytings @ 2022-07-26 11:07 ` Eli Zaretskii 2022-07-26 11:28 ` Gregory Heytings 0 siblings, 1 reply; 9+ messages in thread From: Eli Zaretskii @ 2022-07-26 11:07 UTC (permalink / raw To: Gregory Heytings; +Cc: contovob, emacs-devel > Date: Mon, 25 Jul 2022 20:50:02 +0000 > From: Gregory Heytings <gregory@heytings.org> > cc: "Basil L. Contovounesios" <contovob@tcd.ie>, emacs-devel@gnu.org > > >> 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? > > > > Yes, thanks. > > > > Thanks. But how comes this warning did not show up in my > --enable-checking=all build? I don't know. Is CHECK_STRUCTS set to 'true' in src/Makefile in that build of yours? If not, we may have a bug in configure.ac or elsewhere. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling. 2022-07-26 11:07 ` Eli Zaretskii @ 2022-07-26 11:28 ` Gregory Heytings 0 siblings, 0 replies; 9+ messages in thread From: Gregory Heytings @ 2022-07-26 11:28 UTC (permalink / raw To: Eli Zaretskii; +Cc: contovob, emacs-devel >> Thanks. But how comes this warning did not show up in my >> --enable-checking=all build? > > I don't know. Is CHECK_STRUCTS set to 'true' in src/Makefile in that > build of yours? If not, we may have a bug in configure.ac or elsewhere. > I just checked, and in fact I was confusing the --enable-checking=all and the --enable-checking=yes builds. Sorry for the noise. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-07-26 11:28 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <165799889678.19490.7919197387382513250@vcs2.savannah.gnu.org> [not found] ` <20220716191457.3B0FAC00095@vcs2.savannah.gnu.org> 2022-07-23 11:40 ` feature/fix-the-long-lines-display-bug e7b5912b23: Improvements to long lines handling Basil L. Contovounesios 2022-07-23 13:20 ` Eli Zaretskii 2022-07-23 13:51 ` Basil L. Contovounesios 2022-07-24 11:14 ` Robert Pluim 2022-07-24 11:45 ` Eli Zaretskii 2022-07-24 12:10 ` Robert Pluim 2022-07-25 20:50 ` Gregory Heytings 2022-07-26 11:07 ` Eli Zaretskii 2022-07-26 11:28 ` Gregory Heytings
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).