From mboxrd@z Thu Jan  1 00:00:00 1970
From: phillip.lord@russet.org.uk (Phillip Lord)
Subject: Re: bug#22399: org-mode fontification
Date: Tue, 19 Jan 2016 11:25:01 +0000
Message-ID: <87bn8hreuq.fsf@russet.org.uk>
References: <87oacjng36.fsf@russet.org.uk> <87ziw36khb.fsf@gmx.us>
	<87a8o2zrtm.fsf@russet.org.uk> <87bn8i7mha.fsf@gmx.us>
	<87d1syvgc7.fsf@kyleam.com> <8737tu13la.fsf@kyleam.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40434)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phillip.lord@newcastle.ac.uk>) id 1aLUPM-0007Lp-5T
	for emacs-orgmode@gnu.org; Tue, 19 Jan 2016 06:25:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <phillip.lord@newcastle.ac.uk>) id 1aLUPI-0004Pe-Sc
	for emacs-orgmode@gnu.org; Tue, 19 Jan 2016 06:25:08 -0500
Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:50315)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phillip.lord@newcastle.ac.uk>) id 1aLUPI-0004Pa-J5
	for emacs-orgmode@gnu.org; Tue, 19 Jan 2016 06:25:04 -0500
In-Reply-To: <8737tu13la.fsf@kyleam.com> (Kyle Meyer's message of "Tue, 19 Jan
	2016 01:32:49 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Kyle Meyer <kyle@kyleam.com>
Cc: 22399@debbugs.gnu.org, Org Mode <emacs-orgmode@gnu.org>

Kyle Meyer <kyle@kyleam.com> writes:

> Kyle Meyer <kyle@kyleam.com> writes:
>> Rasmus <rasmus@gmx.us> writes:
>>
>> [...]
>>
>>> Note, this change only lives it the Emacs version of Org.  It was added in
>>> this commit:
>>>
>>>        6711a21f1125c0047c56eb266eb374c1ec90a967
>
> [...]
>
>>
>> This commit was backported in Org commit d81e6b5, and then followed up
>> by c115c7b (org-compat: Use different font-lock-ensure alias,
>> 2015-07-26), which defined the alias as
>>
>>     (unless (fboundp 'font-lock-ensure)
>>       (defalias 'font-lock-ensure 'font-lock-fontify-buffer))
>
> I've attached two patches against emacs-25 that would get the Org and
> Emacs repos in similar states wrt font-lock-ensure.
>
> The first patch replaces the font-lock-ensure compatibility alias from
> 6711a21f1 with the one currently used in the Org repo (from commit
> e6883dd03).  The new alias is limited to being called with no
> arguments, but, at the moment, no Org code calls font-lock-ensure with
> any arguments.
>
> The second patch reverts a part of 6711a21f1 that modified
> org-src-font-lock-fontify-block to use font-lock-ensure rather than
> font-lock-fontify-buffer.  In this particular case, using
> font-lock-ensure instead of font-lock-fontify-buffer fails to
> highlight the source block.


I've tested these on emacs-25 and can confirm that they solve the
problem.

Thanks!

Phil