branch: externals/org
commit 062e30be8a216b30c73fd06a088a5797dd15cbfc
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
org-macs.el: Fix fontification checks take 2
---
lisp/org-macs.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index c71bb40948..9e24e315a5 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1192,7 +1192,8 @@ so values can contain further %-escapes if they are
define later in TABLE."
"Return fontified region between BEG and END."
(when (bound-and-true-p jit-lock-mode)
(org-with-forced-fontification
- (when (text-property-not-all beg end 'org-fold-core-fontified t)
+ (when (or (text-property-not-all beg end 'org-fold-core-fontified t)
+ (text-property-not-all beg end 'fontified t))
(save-match-data (font-lock-fontify-region beg end)))))
(buffer-substring beg end))
@@ -1201,9 +1202,12 @@ so values can contain further %-escapes if they are
define later in TABLE."
(prog1 (looking-at re)
(when (bound-and-true-p jit-lock-mode)
(org-with-forced-fontification
- (when (text-property-not-all
- (match-beginning 0) (match-end 0)
- 'org-fold-core-fontified t)
+ (when (or (text-property-not-all
+ (match-beginning 0) (match-end 0)
+ 'org-fold-core-fontified t)
+ (text-property-not-all
+ (match-beginning 0) (match-end 0)
+ 'fontified t))
(save-match-data
(font-lock-fontify-region (match-beginning 0)
(match-end 0))))))))
