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: Mon, 22 Nov 2021 23:11:46 +0100 Message-ID: <87ilwj3knx.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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19310"; 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 Mon Nov 22 23:12:17 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 1mpHXt-0004qm-IY for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Nov 2021 23:12:17 +0100 Original-Received: from localhost ([::1]:39446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpHXs-0000xK-I9 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Nov 2021 17:12:16 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpHXe-0000xA-Md for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 17:12:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpHXe-0001y6-DM for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 17:12:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpHXe-0004E2-81 for bug-gnu-emacs@gnu.org; Mon, 22 Nov 2021 17:12:02 -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 22:12:02 +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.163761911816230 (code B ref 51016); Mon, 22 Nov 2021 22:12:02 +0000 Original-Received: (at 51016) by debbugs.gnu.org; 22 Nov 2021 22:11:58 +0000 Original-Received: from localhost ([127.0.0.1]:49313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpHXa-0004Dh-Iq for submit@debbugs.gnu.org; Mon, 22 Nov 2021 17:11:58 -0500 Original-Received: from mail-wr1-f45.google.com ([209.85.221.45]:45745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpHXW-0004DP-7F for 51016@debbugs.gnu.org; Mon, 22 Nov 2021 17:11:57 -0500 Original-Received: by mail-wr1-f45.google.com with SMTP id o13so472678wrs.12 for <51016@debbugs.gnu.org>; Mon, 22 Nov 2021 14:11:54 -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=J74BQrS2pJ7ygh/U+7IMu0dveJFHPTvtCavTVY9CHyA=; b=KIog5Ivp1X4zlLdSVVGQ4G0UchvABJ6YcapVE95xhLMSwZ+WyJ5xdbzWrh9Lwe/bFB paY0GolKK1JcBu8WWMiCpWz8gDKy6H18VPPJhu+VAIMr5/jYdeV8NvdmrJ/NNjVMWdAR YGC5sLUDL8jS2qPafHWL9UPI1NcP5Du74Al89kfnOBR1wd3jfIGJ8oOAUPjCaExjc4Vq p9d+FaQeJ1J9YP1TdoAdAspqZsP4TfpvEXFWDBMD2tOHivMGWHC+FBAQ/3H50B/Ox+kZ 7KLIrz8I51S5k486oEAAoWRLz8aZLhVU1lFZSpZbASSTJfLLQS57aBo9pcLgdwMQRy+s 5UqA== 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=J74BQrS2pJ7ygh/U+7IMu0dveJFHPTvtCavTVY9CHyA=; b=azbFeNNeng3mAxnPxpAlx4nBJHXezOQCmUtYvBh87sN/ixPNhIKc+I8DlAPRETzy7u 0tbDgLN3i73CaHhsDd401mzEs6BK1StCghgwTBZJIAyn2M+cZSbf/A8KslGXCqSNghTQ DrvoRb/5chAGnOsvypyVtkqPjcWaD7AJYfixNeVP49gBUM9xK6Xqff+dfl0nPJUXd4ap SSY6aF1Q93D/M1os6N0wZliP2EZBkVCkb2NocfDCNeAWA0Qo/NZDICFg0NbS3c+rTvSR bOHcQzMnxw8WS7BVhDirQhn9Skyi/N4rrQvkvxvumGQdpF++9XK2hmeUQLpAoE8K+h8v 5N1w== X-Gm-Message-State: AOAM530d2l7kIJO/1ZvUKF3BXJAH75VdmMNpY0D1aukLjIQQEcKEFl1y E9cguOlR+IxJ9Gj6ffrA17qlESGGo6c= X-Google-Smtp-Source: ABdhPJzQcwaj0HGWjwZQCDRpt67TNHmPkFpRzr1GtDMjU9kpDMFSz1i8DRtvUN4mun+Kp3pOlX9cKg== X-Received: by 2002:adf:f08d:: with SMTP id n13mr775732wro.395.1637619108402; Mon, 22 Nov 2021 14:11:48 -0800 (PST) Original-Received: from carbon.localdomain ([2a01:e0a:245:c850:98f5:429a:aa8e:95bb]) by smtp.gmail.com with ESMTPSA id i15sm26762981wmq.18.2021.11.22.14.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 14:11:47 -0800 (PST) In-Reply-To: <87mtlx2y3b.fsf@gmail.com> (Matthias Meulien's message of "Sun, 21 Nov 2021 18:54:48 +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:220636 Archived-At: --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-broken-outline-minor-mode-cycling-in-diff-buffer.patch >From cf4ccd97e6d6e82faee5b01224c5a3caa8908cc1 Mon Sep 17 00:00:00 2001 From: Matthias Meulien Date: Mon, 22 Nov 2021 23:06:06 +0100 Subject: [PATCH] Fix broken outline minor mode cycling in diff buffers * lisp/vc/diff-mode.el (diff-setup-buffer-type): Fix outline regexp matching whole line --- lisp/vc/diff-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 8f83aa580e..eeda503afb 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1588,7 +1588,8 @@ diff-setup-buffer-type nil))) (when (eq diff-buffer-type 'git) (setq diff-outline-regexp - (concat "\\(^diff --git.*\n\\|" diff-hunk-header-re "\\)")) + (concat "\\(^diff --git.*\n\\|" + (substring diff-hunk-header-re 0 -1) "\\)")) (setq-local outline-level #'diff--outline-level)) (setq-local outline-regexp diff-outline-regexp)) -- 2.30.2 --=-=-= Content-Type: text/plain -- Matthias --=-=-=--