summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-08-04 23:50:59 -0400
committerKyle Meyer <kyle@kyleam.com>2015-08-04 23:50:59 -0400
commit003a0f10695f035e844d844eacb1a86a6d2df934 (patch)
tree9464b56411d7039a7b94c36a590cee8b24926a96
parentff92583e42db9730c307e001619a828219470908 (diff)
downloadorg-mode-003a0f10695f035e844d844eacb1a86a6d2df934.tar.gz
org-src: Use font-lock-fontify-buffer for blocksrelease_8.3.1
* lisp/org-src.el (org-src-font-lock-fontify-block): Use font-lock-fontify-buffer because font-lock-ensure does not display source block fonts. When font-lock-fontify-buffer was originally replaced by font-lock-ensure, source block fonts were not being displayed, so 99f9999 reverted this change. However, a backport (d81e6b5) from the Emacs repo, which was merged to master in 0d0d0ad, reverted this again. Reported-by: Kaushal Modi <kaushal.modi@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/99495>
-rw-r--r--lisp/org-src.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 96d21d0..8529494 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -497,7 +497,9 @@ as `org-src-fontify-natively' is non-nil."
(delete-region (point-min) (point-max))
(insert string " ") ;; so there's a final property change
(unless (eq major-mode lang-mode) (funcall lang-mode))
- (font-lock-ensure)
+ ;; Avoid `font-lock-ensure', which does not display fonts in
+ ;; source block.
+ (font-lock-fontify-buffer)
(setq pos (point-min))
(while (setq next (next-single-property-change pos 'face))
(put-text-property