summaryrefslogtreecommitdiff
path: root/lisp/org-src.el
diff options
context:
space:
mode:
authorS├ębastien Delafond <sdelafond@gmail.com>2016-03-16 09:54:04 +0100
committerS├ębastien Delafond <sdelafond@gmail.com>2016-03-16 09:54:04 +0100
commit84539dca3aa301ecfe48858eceef1ced0505388b (patch)
treea3c7c7bcc50e7d7a49b22f0eaf8bd8624ff8d048 /lisp/org-src.el
parent8d8ea67656b95d8528b6cd9b43b2d53b847412b0 (diff)
Imported Upstream version 8.3.4
Diffstat (limited to 'lisp/org-src.el')
-rw-r--r--lisp/org-src.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 9c205e1..b7bbf31 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1,6 +1,6 @@
;;; org-src.el --- Source code examples in Org
;;
-;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Bastien Guerry <bzg@gnu.org>
@@ -54,6 +54,7 @@
(declare-function org-trim "org" (s))
(defvar org-element-all-elements)
+(defvar org-inhibit-startup)
(defcustom org-edit-src-turn-on-auto-save nil
"Non-nil means turn `auto-save-mode' on when editing a source block.
@@ -495,9 +496,7 @@ 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))
- ;; Avoid `font-lock-ensure', which does not display fonts in
- ;; source block.
- (font-lock-fontify-buffer)
+ (org-font-lock-ensure)
(setq pos (point-min))
(while (setq next (next-single-property-change pos 'face))
(put-text-property