From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#63622: lisp/progmodes/python.el: performance regression introduced by multiline font-lock Date: Mon, 22 May 2023 11:08:35 -0400 Message-ID: References: <83zg5yqkr1.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28013"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Tom Gillespie , Eli Zaretskii , 63622@debbugs.gnu.org To: kobarity Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 22 17:09:30 2023 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 1q17A9-00077D-LE for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 May 2023 17:09:29 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q179y-0004uq-VC; Mon, 22 May 2023 11:09:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q179m-0004t4-2F for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 11:09:11 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q179i-0004R6-5o for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 11:09:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q179h-0004Fn-T5 for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 11:09:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 May 2023 15:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63622 X-GNU-PR-Package: emacs Original-Received: via spool by 63622-submit@debbugs.gnu.org id=B63622.168476812916332 (code B ref 63622); Mon, 22 May 2023 15:09:01 +0000 Original-Received: (at 63622) by debbugs.gnu.org; 22 May 2023 15:08:49 +0000 Original-Received: from localhost ([127.0.0.1]:35826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q179U-0004FM-Nh for submit@debbugs.gnu.org; Mon, 22 May 2023 11:08:48 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:18549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q179O-0004F4-Qi for 63622@debbugs.gnu.org; Mon, 22 May 2023 11:08:47 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 9604F100117; Mon, 22 May 2023 11:08:37 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 8EE451000BE; Mon, 22 May 2023 11:08:36 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1684768116; bh=YOjFiDW5YebMANbf5RN67kvX0BrTWCJUbGGyrLDEw+Y=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=nFeih6/D40QvP6/5y3Zwg5vQEf9kQPa6OVgafm0UD/pz+ssxzxXBg+tpfoUQyrHXn z+DvtWduIZxRYbYa3zX64mOmrGp5Ngkw7b8bXTreVrDyp8NcPUK4uXYasBfRiYxofA 5jEBU/KfDHVm/SZyUcPO/6Qis59I1AhApMycc0tFj/KYTdMuBFjg39XEgttjbVhkZ2 R/JTbR+nFOykaAsze5hnSiwAByfTcRQ48dKYzuPBBg9tbigUlVHxksNDwHh1qKsxy2 RUTI2oxONXCPYIe3sWQTlesQmuxWrDf7gLvwls9MFG0BAof5ha0SaJ0rRGQ1M1vtFE F6j6UnRHiolgA== Original-Received: from pastel (unknown [45.72.217.176]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 4EBD41203DF; Mon, 22 May 2023 11:08:36 -0400 (EDT) In-Reply-To: (kobarity@gmail.com's message of "Mon, 22 May 2023 23:58:37 +0900") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:262162 Archived-At: > @@ -869,18 +869,20 @@ python-font-lock-keywords > Which one will be chosen depends on the value of > `font-lock-maximum-decoration'.") > > -(defun python-font-lock-extend-region (beg end _old-len) > - "Extend font-lock region given by BEG and END to statement boundaries." > - (save-excursion > - (save-match-data > - (goto-char beg) > - (python-nav-beginning-of-statement) > - (setq beg (point)) > - (goto-char end) > - (python-nav-end-of-statement) > - (setq end (point)) > - (cons beg end)))) > - > +(defvar font-lock-beg) > +(defvar font-lock-end) > +(defun python-font-lock-extend-region () > + "Extend font-lock region to statement boundaries." > + (let ((beg font-lock-beg) > + (end font-lock-end)) > + (goto-char beg) > + (python-nav-beginning-of-statement) > + (setq font-lock-beg (point)) > + (goto-char end) > + (python-nav-end-of-statement) > + (when (not (eobp)) (forward-char)) > + (setq font-lock-end (point)) > + (or (/= beg font-lock-beg) (/= end font-lock-end)))) > > (defconst python-syntax-propertize-function > (syntax-propertize-rules Looks fine to me (I assume you've checked that it behaves about as well as the previous code). > @@ -6708,8 +6710,8 @@ python-mode > nil nil nil nil > (font-lock-syntactic-face-function > . python-font-lock-syntactic-face-function) > - (font-lock-extend-after-change-region-function > - . python-font-lock-extend-region))) > + (font-lock-extend-region-functions > + . (python-font-lock-extend-region)))) > (setq-local syntax-propertize-function > python-syntax-propertize-function) > (setq-local imenu-create-index-function This is bound to break in some cases. Please use `add-hook` instead. Stefan