From: Gregory Heytings <gregory@heytings.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 57207@debbugs.gnu.org, yantar92@gmail.com
Subject: bug#57207: 29.0.50; Fontification is slow after e7b5912b23 (Improvements to long lines handling)
Date: Tue, 16 Aug 2022 10:47:00 +0000 [thread overview]
Message-ID: <325f95fd2b7c0cc80613@heytings.org> (raw)
In-Reply-To: <83bksmka08.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]
>
> Gregory, I suspect that the problem could be in the loop in
> redisplay_window, where we look for long lines. Changing visibility in
> Org changes text properties, and that causes MODIFF to be incremented.
> I actually can cause something similar without Org at all, just by
> scrolling fast through xdisp.c. You can put a breakpoint inside the
> 'if' that guards the re-evaluation of the long-lines in
> redisplay_window, and scroll with C-v through xdisp.c immediately after
> visiting it -- I hit the breakpoint from time to time, although there
> are no changes to the buffer except faces placed by fontifications.
>
> jit-lock runs under with-silent-modifications, but that only adjusts
> SAVE_MODIFF to create an illusion of unchanged buffer, it doesn't affect
> UNCHANGED_MODIFIED.
>
Indeed, that's problematic: modify_text_properties calls modiff_incr
(&MODIFF, 1). I think the safest change would be to use CHARS_MODIFF
instead of MODIFF, see attached.
Ihor, can you please test that patch and tell us if it solves your
problem?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: use_chars_modiff.patch --]
[-- Type: text/x-diff; name=use_chars_modiff.patch, Size: 2201 bytes --]
diff --git a/src/buffer.h b/src/buffer.h
index 47b4bdf749..77f9ea20af 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -149,12 +149,18 @@ #define BUF_OVERLAY_UNCHANGED_MODIFIED(buf) \
#define BUF_BEG_UNCHANGED(buf) ((buf)->text->beg_unchanged)
#define BUF_END_UNCHANGED(buf) ((buf)->text->end_unchanged)
+#define BUF_CHARS_UNCHANGED_MODIFIED(buf) \
+ ((buf)->text->chars_unchanged_modified)
+
#define UNCHANGED_MODIFIED \
BUF_UNCHANGED_MODIFIED (current_buffer)
#define OVERLAY_UNCHANGED_MODIFIED \
BUF_OVERLAY_UNCHANGED_MODIFIED (current_buffer)
#define BEG_UNCHANGED BUF_BEG_UNCHANGED (current_buffer)
#define END_UNCHANGED BUF_END_UNCHANGED (current_buffer)
+
+#define CHARS_UNCHANGED_MODIFIED \
+ BUF_CHARS_UNCHANGED_MODIFIED (current_buffer)
\f
/* Functions to set PT in the current buffer, or another buffer. */
@@ -268,6 +274,9 @@ #define FETCH_BYTE(n) *(BYTE_POS_ADDR ((n)))
end_unchanged contain no useful information. */
modiff_count overlay_unchanged_modified;
+ /* CHARS_MODIFF as of last redisplay that finished. */
+ modiff_count chars_unchanged_modified;
+
/* Properties of this buffer's text. */
INTERVAL intervals;
diff --git a/src/xdisp.c b/src/xdisp.c
index 0248e8e53f..c92231abcf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17323,6 +17323,7 @@ mark_window_display_accurate_1 (struct window *w, bool accurate_p)
BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b);
BUF_OVERLAY_UNCHANGED_MODIFIED (b) = BUF_OVERLAY_MODIFF (b);
+ BUF_CHARS_UNCHANGED_MODIFIED (b) = BUF_CHARS_MODIFF (b);
BUF_BEG_UNCHANGED (b) = BUF_GPT (b) - BUF_BEG (b);
BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b);
@@ -19585,7 +19586,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
/* Check whether the buffer to be displayed contains long lines. */
if (!NILP (Vlong_line_threshold)
&& !current_buffer->long_line_optimizations_p
- && MODIFF - UNCHANGED_MODIFIED > 8)
+ && CHARS_MODIFF - CHARS_UNCHANGED_MODIFIED > 8)
{
ptrdiff_t cur, next, found, max = 0, threshold;
threshold = XFIXNUM (Vlong_line_threshold);
next prev parent reply other threads:[~2022-08-16 10:47 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-14 15:55 bug#57207: 29.0.50; Fontification is slow after e7b5912b23 (Improvements to long lines handling) Ihor Radchenko
2022-08-14 16:08 ` Gregory Heytings
2022-08-14 17:31 ` Eli Zaretskii
2022-08-15 2:35 ` Eli Zaretskii
2022-08-15 9:03 ` Gregory Heytings
2022-08-15 11:41 ` Ihor Radchenko
2022-08-15 12:08 ` Eli Zaretskii
2022-08-16 10:47 ` Gregory Heytings [this message]
2022-08-16 11:55 ` Eli Zaretskii
2022-08-16 12:16 ` Ihor Radchenko
2022-08-16 12:24 ` Gregory Heytings
2022-08-16 12:39 ` Eli Zaretskii
2022-08-16 12:17 ` Gregory Heytings
2022-08-16 12:28 ` Ihor Radchenko
2022-08-16 12:43 ` Gregory Heytings
2022-08-20 16:50 ` Gregory Heytings
2022-08-21 3:25 ` Ihor Radchenko
2022-08-21 9:01 ` Gregory Heytings
2022-08-22 2:31 ` Ihor Radchenko
2022-08-22 14:09 ` Gregory Heytings
2022-08-22 15:45 ` Eli Zaretskii
2022-08-23 15:53 ` Gregory Heytings
2022-08-24 8:08 ` Ihor Radchenko
2022-08-24 8:26 ` Gregory Heytings
2022-10-10 8:09 ` Lars Ingebrigtsen
2022-10-10 12:03 ` Gregory Heytings
2022-10-11 0:25 ` Lars Ingebrigtsen
2022-12-08 10:05 ` Gregory Heytings
2022-08-16 12:50 ` Eli Zaretskii
2022-08-16 12:43 ` Eli Zaretskii
2022-08-15 11:39 ` Ihor Radchenko
2022-08-15 12:06 ` Eli Zaretskii
2022-08-15 14:12 ` Ihor Radchenko
2022-08-15 14:28 ` Eli Zaretskii
2022-08-15 17:08 ` Eli Zaretskii
2022-08-16 9:39 ` Ihor Radchenko
2022-08-16 12:33 ` Eli Zaretskii
2022-08-16 12:44 ` Gregory Heytings
2022-08-16 9:38 ` Ihor Radchenko
2022-08-14 16:24 ` Eli Zaretskii
2022-08-15 11:42 ` Ihor Radchenko
2022-08-15 11:53 ` Lars Ingebrigtsen
2022-08-15 12:10 ` Eli Zaretskii
2022-08-17 10:42 ` Lars Ingebrigtsen
2022-08-17 12:10 ` Eli Zaretskii
2022-08-17 12:36 ` Lars Ingebrigtsen
2022-08-17 13:27 ` Eli Zaretskii
2022-08-18 13:02 ` Lars Ingebrigtsen
2022-08-18 13:23 ` Eli Zaretskii
2022-08-18 13:33 ` Eli Zaretskii
2022-08-18 13:51 ` Lars Ingebrigtsen
2022-08-18 14:01 ` Lars Ingebrigtsen
2022-08-18 14:10 ` Eli Zaretskii
2022-08-18 14:13 ` Eli Zaretskii
2022-08-18 13:50 ` Lars Ingebrigtsen
2022-08-18 13:58 ` Eli Zaretskii
2022-08-18 14:02 ` Lars Ingebrigtsen
2022-08-18 14:13 ` Lars Ingebrigtsen
2022-08-18 14:14 ` Lars Ingebrigtsen
2022-08-18 14:32 ` Eli Zaretskii
2022-08-18 14:38 ` Lars Ingebrigtsen
2022-08-18 15:49 ` Eli Zaretskii
2022-08-19 12:02 ` Lars Ingebrigtsen
2022-08-19 12:22 ` Eli Zaretskii
2022-08-19 15:50 ` Lars Ingebrigtsen
2022-08-19 16:02 ` Lars Ingebrigtsen
2022-08-19 16:08 ` Lars Ingebrigtsen
2022-08-19 16:11 ` Eli Zaretskii
2022-08-19 16:16 ` Lars Ingebrigtsen
2022-08-19 17:21 ` Eli Zaretskii
2022-08-19 17:25 ` Lars Ingebrigtsen
2022-08-19 17:51 ` Eli Zaretskii
2022-08-20 9:15 ` Lars Ingebrigtsen
2022-08-20 9:29 ` Eli Zaretskii
2022-08-20 9:57 ` Lars Ingebrigtsen
2022-08-20 10:33 ` Eli Zaretskii
2022-08-20 17:14 ` Gregory Heytings
2022-08-20 17:26 ` Eli Zaretskii
2022-08-20 17:46 ` Gregory Heytings
2022-08-20 23:22 ` Gregory Heytings
2022-08-21 5:46 ` Eli Zaretskii
2022-08-21 11:43 ` Gregory Heytings
2022-08-21 12:02 ` Eli Zaretskii
2022-08-21 12:42 ` Gregory Heytings
2022-08-21 12:47 ` Lars Ingebrigtsen
2022-08-21 13:22 ` Gregory Heytings
2022-08-21 13:27 ` Lars Ingebrigtsen
2022-08-21 13:32 ` Gregory Heytings
2022-08-21 13:37 ` Lars Ingebrigtsen
2022-08-21 13:42 ` Eli Zaretskii
2022-08-21 13:38 ` Gregory Heytings
2022-08-21 13:39 ` Eli Zaretskii
2022-08-21 12:53 ` Eli Zaretskii
2022-08-21 13:18 ` Gregory Heytings
2022-08-21 13:24 ` Eli Zaretskii
2022-08-21 19:38 ` Gregory Heytings
2022-08-21 20:47 ` Lars Ingebrigtsen
2022-08-22 12:32 ` Eli Zaretskii
2022-08-22 14:00 ` Gregory Heytings
2022-08-21 12:08 ` Lars Ingebrigtsen
2022-08-19 16:20 ` Visuwesh
2022-08-19 17:22 ` Eli Zaretskii
2022-08-19 16:12 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=325f95fd2b7c0cc80613@heytings.org \
--to=gregory@heytings.org \
--cc=57207@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=yantar92@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).