Merge from origin/emacs-25

ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate...
7e02a47 Index byte-compile-debug
7c1e598 Document `byte-compile-debug' in the ELisp manual
4d81eb4 Document variable `byte-compile-debug'
72ef710 Fix call to debugger on assertion failure
ae8264c Call modification hooks in org-src fontify buffers
b3139da ; Fix last change in doc/lispref/strings.texi
c331f39 Improve documentation of 'format' conversions
9f52f67 Remove stale functions from ert manual
c416b14 Fix a typo in Eshell manual
06695a0 ; Fix a typo in ediff-merg.el
954e9e9 Improve documentation of hooks related to saving buffers
9fcab85 Improve documentation of auto-save-visited-file-name
2236c53 fix typo in mailcap-mime-extensions
85a3e4e Fix typos in flymake.el
a1ef10e More NEWS checking for admin.el's set-version

# Conflicts:
#	lisp/emacs-lisp/bytecomp.el

1 files changed, 14 insertions, 10 deletions

diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 0e82cfda7b8..caa6526435b 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -914,16 +914,20 @@ fontification of code blocks see `org-src-fontify-block' and
           (with-current-buffer
               (get-buffer-create
                (concat " org-src-fontification:" (symbol-name lang-mode)))
-            (delete-region (point-min) (point-max))
-            (insert string " ") ;; so there's a final property change
-            (unless (eq major-mode lang-mode) (funcall lang-mode))
-            (org-font-lock-ensure)
-            (setq pos (point-min))
-            (while (setq next (next-single-property-change pos 'face))
-              (put-text-property
-               (+ start (1- pos)) (1- (+ start next)) 'face
-               (get-text-property pos 'face) org-buffer)
-              (setq pos next)))
+            ;; Make sure that modification hooks are not inhibited in
+            ;; the org-src-fontification buffer in case we're called
+            ;; from `jit-lock-function' (Bug#25132).
+            (let ((inhibit-modification-hooks 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))
+              (org-font-lock-ensure)
+              (setq pos (point-min))
+              (while (setq next (next-single-property-change pos 'face))
+                (put-text-property
+                 (+ start (1- pos)) (1- (+ start next)) 'face
+                 (get-text-property pos 'face) org-buffer)
+                (setq pos next))))
           (add-text-properties
            start end
            '(font-lock-fontified t fontified t font-lock-multiline t))