From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Matthias Meulien Newsgroups: gmane.emacs.bugs Subject: bug#51016: 28.0.50; 'diff-font-lock-prettify' breaks display of outline headers Date: Tue, 23 Nov 2021 00:03:23 +0100 Message-ID: <87ee773i9w.fsf@gmail.com> References: <87bl44qz5o.fsf@gmail.com> <87wnmgk6r7.fsf@gmail.com> <87tugrmi1j.fsf@gnus.org> <86pmqxuymw.fsf@mail.linkov.net> <87ee7cwqwj.fsf@gnus.org> <86r1bcpo5i.fsf@mail.linkov.net> <87zgpzrznf.fsf@gnus.org> <86y25imyna.fsf@mail.linkov.net> <87k0h1mogn.fsf@gnus.org> <87r1b92zea.fsf@gmail.com> <86h7c5qucg.fsf@mail.linkov.net> <87mtlx2y3b.fsf@gmail.com> <87ilwj3knx.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35046"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Lars Ingebrigtsen , 51016@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 23 00:04:11 2021 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 1mpIM7-0008ri-DU for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Nov 2021 00:04:11 +0100 Original-Received: from localhost ([::1]:59046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpIM6-0008Dv-46 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Nov 2021 18:04:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpILy-0008DV-7M for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 18:04:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpILx-0007yH-Ug for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 18:04:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpILx-0005iC-N9 for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 18:04:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Matthias Meulien Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Nov 2021 23:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51016 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51016-submit@debbugs.gnu.org id=B51016.163762221321917 (code B ref 51016); Mon, 22 Nov 2021 23:04:01 +0000 Original-Received: (at 51016) by debbugs.gnu.org; 22 Nov 2021 23:03:33 +0000 Original-Received: from localhost ([127.0.0.1]:49359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpILV-0005hR-3i for submit@debbugs.gnu.org; Mon, 22 Nov 2021 18:03:33 -0500 Original-Received: from mail-wr1-f54.google.com ([209.85.221.54]:47064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpILS-0005hC-Rk for 51016@debbugs.gnu.org; Mon, 22 Nov 2021 18:03:31 -0500 Original-Received: by mail-wr1-f54.google.com with SMTP id u1so35505089wru.13 for <51016@debbugs.gnu.org>; Mon, 22 Nov 2021 15:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=FvdbWTX1hyzmt+1R3cCrnNa7naNOC9H8WzL/2hVjKP4=; b=C3f2/1JplBa2hZiTBxh2C0mG3nR9Qibx4Deb6O/JXoyO2cWAgWORiAUQt82ssfASns 0FoZ62QkIxJxxuvwrGNJP7o+vv3+Ocxf5fDG77hZ5Ll2Nj7Ozf2TU/jdGZkafAUQgAto NBnSiS80LdyF+qNKSOdUAgv0nYF+Icyvp9bjY1zmzzsJyUQHLkdYCaSbJrSRvBxnMcQP 2LEt2mZGpJIH2z74L1t39KTRZ8mAeCngvls89DUC9Uh0C62M2Em8qZn4fiuifCLQQ9cW 6nFYCPn9J0Il8Yfjc4gBteFC8Jry2EnK8mydlkv8NCqCUyNxvYLBzvHn5uS04W3h8NAY AXog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=FvdbWTX1hyzmt+1R3cCrnNa7naNOC9H8WzL/2hVjKP4=; b=1m1woltCgCAWgSFTyZi8SQKk+xpkTpqH9VHROzu7Eo/oQNdAxz5aOl/WW4Dy7EcJPi IFst+9aKJPcbkuDlXbYnjuz7HApNgPF88ihvFuAaE43UBWIRfylyWAjKZeJg33Kqon8U rzDn8tRAWbPUxV4diaMOA/BU1V9rx9j6DI00DTytUzfdCHge8OY60H1nWqRSjzKbV8iB cJtnRx90qdpbPCaLTlUgYgD3ylj0U+XW1eK+ij5xB32PApWXO+1VohSj0odxFoiU3KuP 1QFq4/hvS9n5j2qKjnV1PpYoLyhaQ6PZvCzzYKyf7WBvps15TS+PtrAQYSDaEg0/Qt65 mXJg== X-Gm-Message-State: AOAM531RgSqfjc+PCuoDjYewyEDDDzm3L3NMK/U0DDhexlYkDPVdHFrl y//kpnBrS7eBi4pGatAZg4K5AB7wGGs= X-Google-Smtp-Source: ABdhPJwI2V5sSZXHg/ib78RGRkcMoPf84aWtrWU4Q3gEqcsnLJfL/Yq+WLkGcPcaduXRJrc6JT2vYQ== X-Received: by 2002:a5d:548f:: with SMTP id h15mr1184527wrv.99.1637622204860; Mon, 22 Nov 2021 15:03:24 -0800 (PST) Original-Received: from carbon.localdomain ([2a01:e0a:245:c850:98f5:429a:aa8e:95bb]) by smtp.gmail.com with ESMTPSA id h2sm9955016wrz.23.2021.11.22.15.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 15:03:23 -0800 (PST) In-Reply-To: <87ilwj3knx.fsf@gmail.com> (Matthias Meulien's message of "Mon, 22 Nov 2021 23:11:46 +0100") 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:220637 Archived-At: Matthias Meulien writes: >> Juri Linkov writes: >> >>> I confirm there is a relation because the commit f0768d3145 >> >> Oh you're right. Sorry. >> >>> However, changing the .+ thing to .* in outline-font-lock-keywords >>> fixes this problem. So we need to decide whether to try to remove >>> entire line mathing from diff-hunk-header-re (not sure how easy to >>> do), > > I just skipped last character of `diff-hunk-header-re' (the culprit `$') > when building `diff-outline-regexp'; Cycling is restored when on hunk > headers. Looks safe to me since `diff-hunk-header-re' is unchanged. Ok, it works on hunks with "context information" like @@ -147,6 +160,61 @@ diff-font-lock-syntax But it's still broken when there's no "context information" like @@ -50,6 +50,7 @@ which argues for your second suggestion, changing `outline-font-lock-keywords'. -- Matthias