Could Org maintainers weigh in on bug#42184? To recap my understanding of the issue: - org-fontify-whole-heading-line controls whether org-set-font-lock-defaults includes the final newline in the headline regexp (resp. org-fontify-whole-block-delimiter-line with begin/end block regexps). - This assumes that fontifying the final newline is enough to fontify everything beyond this newline. - This assumption is no longer valid with Emacs 27, where this extension is opt-in, using the :extend face attribute. With Eli's help, I proposed a patch for org-mode against the emacs-27 branch that does something similar to what is done for the org-hide face: when setting up the major mode, depending on those user options, the :extend attribute is (re)set for the relevant faces (using a compatibility function defined in org-compat). I've reattached the patch for convenience. Does it look sound?