Kyle Meyer <k...@kyleam.com> writes: > Kyle Meyer <k...@kyleam.com> writes: >> Rasmus <ras...@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
