Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-01-21 21:45:50 +01:00
commit a23a483245
1 changed files with 3 additions and 2 deletions

View File

@ -4095,8 +4095,9 @@ If STRING is the empty string or nil, return nil."
(ignore-errors (ignore-errors
(if (symbolp v) (makunbound v) (if (symbolp v) (makunbound v)
(set (make-local-variable (car v)) (cdr v))))) (set (make-local-variable (car v)) (cdr v)))))
(insert string) ;; Transferring local variables may put the temporary buffer
(restore-buffer-modified-p nil) ;; into a read-only state. Make sure we can insert STRING.
(let ((inhibit-read-only t)) (insert string))
(org-element--parse-objects (org-element--parse-objects
(point-min) (point-max) nil restriction parent)))))) (point-min) (point-max) nil restriction parent))))))