From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#51016: 28.0.50; 'diff-font-lock-prettify' breaks display of outline headers Date: Tue, 09 Nov 2021 10:19:07 +0200 Organization: LINKOV.NET Message-ID: <86ee7phhc4.fsf@mail.linkov.net> References: <87bl44qz5o.fsf@gmail.com> <87wnmgk6r7.fsf@gmail.com> <87tugrmi1j.fsf@gnus.org> <86ee7t8cgl.fsf@mail.linkov.net> <874k8pb0hq.fsf@gnus.org> <87czna6znw.fsf@gmail.com> <87o86ut2g4.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2644"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: Matthias Meulien , 51016@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 09 09:21: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 1mkMNT-0000W0-EI for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 09 Nov 2021 09:21:11 +0100 Original-Received: from localhost ([::1]:54738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkMNS-00035w-FY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 09 Nov 2021 03:21:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkMNL-00035m-1w for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 03:21:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkMNK-0005sF-PH for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 03:21:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkMNK-0003dm-Jd for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2021 03:21:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 09 Nov 2021 08:21: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.163644601413910 (code B ref 51016); Tue, 09 Nov 2021 08:21:02 +0000 Original-Received: (at 51016) by debbugs.gnu.org; 9 Nov 2021 08:20:14 +0000 Original-Received: from localhost ([127.0.0.1]:60727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkMMY-0003cI-Lr for submit@debbugs.gnu.org; Tue, 09 Nov 2021 03:20:14 -0500 Original-Received: from relay12.mail.gandi.net ([217.70.178.232]:53955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkMMX-0003bm-28 for 51016@debbugs.gnu.org; Tue, 09 Nov 2021 03:20:14 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by relay12.mail.gandi.net (Postfix) with ESMTPSA id C178E200011; Tue, 9 Nov 2021 08:20:05 +0000 (UTC) In-Reply-To: <87o86ut2g4.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 09 Nov 2021 04:47:39 +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:219427 Archived-At: >> I suggest to restore the original call to `diff-mode` (before the >> asynchronous operation completes) and keep the initialization of >> `diff-buffer-type` by searching but make it available to >> `vc-diff-finish' which is called when the asynchronous operation >> completes. >> >> See the attached patch for details. > > Thanks; this fixes the problem reported by Juri (as far as I can see > after doing some light testing), so I've now pushed the patch to Emacs > 29. I confirm it's fixed (Matthias placed two counterpart functions together: diff-setup-whitespace and diff-setup-buffer-type in the patch, so I restored the same in master for readability).