From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.bugs Subject: bug#56682: Fix the long lines font locking related slowdowns Date: Mon, 01 Aug 2022 15:08:42 +0000 Message-ID: References: <831qu7daxb.fsf@gnu.org> <83sfmnb7yg.fsf@gnu.org> <837d3ybh5z.fsf@gnu.org> <136c4fe0fc74196714aa@heytings.org> <83pmhp89ov.fsf@gnu.org> <136c4fe0fc39573addc9@heytings.org> <83k07x8738.fsf@gnu.org> <136c4fe0fcdf00ef9a11@heytings.org> <83h73183r7.fsf@gnu.org> <136c4fe0fc0fceb0d752@heytings.org> <838roc8ka7.fsf@gnu.org> <83tu706obt.fsf@gnu.org> <83h7306ifa.fsf@gnu.org> <83edy37pul.fsf@gnu.org> <83pmhn55sk.fsf@gnu.org> <65cb7c73fdc753518d35@heytings.org> <83fsii68o3.fsf@gnu.org> <65cb7c73fdf6704d19d5@heytings.org> <835yje62vz.fsf@gnu.org> <83r1214uz5.fsf@gnu.org> <8c7321f2f39b7a28dd18@heytings.org> <83o7x42l64.fsf@gnu.org> <83edy02j2n.fsf@gnu.org> <83a68o2i3k.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29048"; mail-complaints-to="usenet@ciao.gmane.io" Cc: gerd.moellmann@gmail.com, 56682@debbugs.gnu.org, larsi@gnus.org, monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 01 17:09:29 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oIX2v-0007OU-0B for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 01 Aug 2022 17:09:29 +0200 Original-Received: from localhost ([::1]:35534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIX2t-0002cB-S7 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 01 Aug 2022 11:09:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIX2U-0002bw-U0 for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 11:09:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIX2U-0001Xo-FF for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 11:09:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIX2U-0002eS-5P for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 11:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gregory Heytings Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Aug 2022 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56682 X-GNU-PR-Package: emacs Original-Received: via spool by 56682-submit@debbugs.gnu.org id=B56682.165936652810166 (code B ref 56682); Mon, 01 Aug 2022 15:09:02 +0000 Original-Received: (at 56682) by debbugs.gnu.org; 1 Aug 2022 15:08:48 +0000 Original-Received: from localhost ([127.0.0.1]:41390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIX2F-0002du-Pn for submit@debbugs.gnu.org; Mon, 01 Aug 2022 11:08:48 -0400 Original-Received: from heytings.org ([95.142.160.155]:34006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIX2C-0002di-7E for 56682@debbugs.gnu.org; Mon, 01 Aug 2022 11:08:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1659366523; bh=NPD9AE+p65rika0xcwcD5QdPnOawjOkODdXhUrYSZMc=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=cYKLRZbM675vYlb9EWIanEE9y0FFtnu+LPbe1e3vL17Bx6xOd0iMJiTScoP+2V2O+ R2Y2HbOs93L6ZAKXnyHeRKiwY8QpNTGERwWBDBmOkHuRXR/nEa5XfS6S++ygfQ+0mk 5cHV8voZw1VGNy/oFB5xstnvV7iuGSsanyCBNC7u+i2Ygqj+3ZI2ka5m8RGpeSw5lc Xg8X+/lquvzILQtXcFiTnYzOo6YyHU5Ye4dJXOwWvCGzv6GAMQ9E+C6eye9zH5h7RV 5BrvRjSoqBQZFtoXa+tAQyiyPyeQLqQ0Evzk/54FjPW+r7snlbI1mgePRlGAIOl1v4 THyl9YlZsPLUg== In-Reply-To: <83a68o2i3k.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:238446 Archived-At: > > I think we should simply unconditionally recompute the narrowing in > 'reseat'. At least I couldn't think of a situation where that would > cause trouble, and 'reseat' is called rarely enough not to make this > expensive. Am I missing something? > I don't think you are missing something, and that's what I suggested too. So there is nothing to change here, right? > > And another nit: > > if (current_buffer->long_line_optimizations_p) > { > if (!it->narrowed_begv > || ((pos.charpos < it->narrowed_begv || pos.charpos > it->narrowed_zv) > && (!redisplaying_p || it->line_wrap == TRUNCATE))) > { > it->narrowed_begv = get_narrowed_begv (it->w, window_point (it->w)); > it->narrowed_zv = get_narrowed_zv (it->w, window_point (it->w)); > } > } > > I think this should pass pos.charpos as the 2nd argument to > get_narrowed_begv and get_narrowed_zv, otherwise it might not really > correct anything, right? In particular, when lines are truncated, that > will definitely happen when we display any line but the very first. > > Or perhaps we should check that using window-point indeed brings > pos.charpos into the narrowed region, and only use pos.charpos if it > doesn't? > I changed this into: if (current_buffer->long_line_optimizations_p) { if (!it->narrowed_begv) { it->narrowed_begv = get_narrowed_begv (it->w, window_point (it->w)); it->narrowed_zv = get_narrowed_zv (it->w, window_point (it->w)); } else if ((pos.charpos < it->narrowed_begv || pos.charpos > it->narrowed_zv) && (!redisplaying_p || it->line_wrap == TRUNCATE)) { it->narrowed_begv = get_narrowed_begv (it->w, pos.charpos); it->narrowed_zv = get_narrowed_zv (it->w, pos.charpos); } } which seems better indeed. Is that okay from your point of view?